Integrated new design
conflict resolved