refs #156 done