worked on the design
merged