Changes done in design
Added design changes