Updated some of the design ideas.