Added 2D movement, replaced 1D old movement