Fifi2

rebased and fixed all conflicts