Yet more design iteration