Simplifying design a bit.