added movement
Fixeed merge