refs #54 - finished modification