Unreliable part of syncing works now with new architecture