Changes proposed by V.Magerya