refs #154 done