Added PAPI stuff. more left to be added