Changed how stop works