Changes to PAPI
PAPI changes to Toci