design changes
merged