first pass with new design