merging in the new design