refs #2 - Response to feedback from @dpoirier