First pass: comments added