Implementing some suggested changes to the design.