Simplifying the design some more