Revert "Revert "Movement actions fixed""

This reverts commit f421efd031e75dee89f42f7ef1e10d60f5d44292.