added papi modifications