Removed the stop feature