finished initial redesign