Added ability to stop moving to type