new interface; separate Wait and Stop