Changed stop logic