Added logic of buffer watcher, not tested yet