Added more design changes