refs #159 done