Merged and moved movement event callbacks to bottom