first commit for watch_and_sync