Make further design changes per Geoff's direction