adjusted unwatch timing