improved STOP internally to make more sense