Improve watch function