fixes to move timing