Second pass, comments added in text