finish up model building issue #64