modified movement and map