Updated for supervisor to watch entire