More logic for movement