Increased the time-out and added a separate message for "not moving"