Move the can_update check back to original spot