more adjustments after Michael's email