Firmed up design a little