Some simple design changes