added ability to stop