Changes to stop button problem