Revert "* Movement updates"

This reverts commit c69ca317109011e1dc30c33b87ebed7a3660c83f.
Revert "Revert "* Movement updates""

This reverts commit 77590af56b6c5566bc21aab0795f9c58fbe2ab4c.