update for pp->zh
update the f2 and f3 calcaultions