Yes, but increase state pensions to a level that allows a pensioner to live. Anyone with excess will pay some tax, simple and probably cheaper to administer.

State Pensions system is a mess and unaffordable in the way its administered. As things stand, all payments are paid for by current workers, not contributions that r built up over time. Until that changes it is unlikely to be more generous