Overhaul Sync with custom implementation.