add dropwait and remove iwatch