working on improving sync performance