finish work on watching subsystem.