Changes by V.Fedorov