Accommodate new design.