Improve movement sync