fixed movement (BEN do not commit/sync yet)