Changed the design... again.