Added PA and RFA