Make design changes per Geoff's direction