Added user_sub evaluation at end of each step

Fix to restart