Incorporated Ye's output fn, removed PAPI