refs #157 done