Adjust to new design.