Changing PAP model as per discussion