Updated to the new output specs