PanD2, PanF2 added