some changes proposed by willum