Sync prior to refactoring