new design
merging