minor reorder
merging