Updated to reflect new output format from python