Added some untested PAPI code