pfq-gen improved.