Incorporated comments by RS, OIW, TM