update changes according to commentaries

update changes according to commentaries