Reach feature parity with previous design.