Changes to finalize firt functional pass of the psn strategy