[finish #73751092 #73751142] updates requested by Jon and Debra