Added un-watch fn