Updated FG after removal of P1Functions