Further work on note syncing