Updated outputs per project requirements (last page of spec)