Updated to new output