Updated for new sync design