All changes are also commented into the source code; search TN: