Updated to the new format