A bit of design modification