Added movement checks