Refactor when update_variables gets called - now in retro_run