updated to new output format