Tightening up the design