refs #549,

Code updates: