More changes to new style.