Second Attempt 12.15, with additional comment changes