update to new format