added 'watch' functionality