added watching feature