Sync implementation finalised