Checked: comments added (edited)