updated the designs
merged changes