Separated some units from the game watcher