PA related updates (credit RootBox)