fixed Dakota's fixes