Adapted logic to watch