final-steps are now after-steps