Get rid of the stop flag and use a stopChan