More retirement alignment

Re-align to retirement rather than the base setup even further.