mirrored changes to revitwatchhandler