Begin synchronize refactor