more changes for data merging