Re-sync

Old sync didn't include the stuff I wanted to sync