Incorporated feedback from Richard Barnes.