merged new design