The substantive changes based on Ben's AD review #56

Closed cdh4u closed 6 years ago