Added stop and wait