final addition
after B2 conflit