redesign first pass