Changed the starting and stopping system