verzak1_branch refactored movement