PF rebuild 2