tightening up design