Yes and increase to cap to 50 million dollars so all pay into it. But reduce anyone who has another retirement by percentages. Stop congress or the president from moving Social Security to the general fund. Then it will survive. IRA's, 401, or any individual retirement account under one million dollars should be exempt.