Before refactoring for sync