Moved timing of movement to master