pulling changes from pa-legacy