Minor Movement Changes
Merge branch 'steven' into development

* steven:
  Minor Movement Changes