Notation change + minor correction