First set of design changes
Merged design changes