Integrating @markhurrell's design direction.