updating&w10-12

Cf commits