Overall design changes