refs #498 - Changes in response to feedback from @copelco