more adjustments from incorrect copy and paste