Changes to design

Changes to design