If it were up to me, Dis, we'd offer an option to current beneficiaries of continuing with the program as is or opting out and taking a tax credit for the remainder of any contributions plus, say, 10%. For those who have not started receiving benefits but have 25 or more years in contributions they'd get the same option with a reduced benefit but also be allowed to contribute up to 10% of their wages to a retirement plan tax free (like an IRA but without the contribution cap). For those with less than 25 years paid in they wouldn't get an option on receiving benefits but they would get the tax credit and be allowed to contribute up to 15% of their wages tax free.