Tweaked the output format to better match C3 requirements