FOIL improvements