main commit for Michel Buffa