Minor edits from Engelhardt