separated revit functionality from Watch