Second pass: comment added