Third pass: comment added