Minor changes during lab, from Osmond