Converted to new sync design