Added ability to stop while moving