Design Changes

Changes