Initial sync now does the right thing