Updated to new format