Fix2/time watcher