ajust to new format