Modifying polling + watch system.