Updated output to include original fields

Pain in the ass.