Second pass: comment added / to be finalized