some commentaries changed