countPN added F_q support