convert to new format