Alisa movement refactoring