Worked on design changes