and a design pass in general
and a design pass in general