Synchronize refactored