Modified watch function, tests OK