Moving upgrade_in_progress to the gear level