Vigil-watchers RE-EDIT