edit to movement calculator
Merge origin/master