Tweaked start() and stop() code