Added design changes