Changed Movement

Changed Movement event handling