OW940 -- last modifications from 940