Initial design changes made