Improve pf layer