Converted more to the new design.