V2 calculate state pension updates

More updates from discussion with Heinrich.