change stop logic