Updated output to include only values needed.