Update to utility code; new output