Second pass: comments added