redesign per Mark's request