Changes for new format