sync refactoring nearly finished