updated PAPI files and interface with Andrew Siegels changes