Change to new format.