from B1
modification added
after B1 conflit