adapting to the new format