added ids (FA, NF, PD)