Updates in better sync flow.