More adjustments to haste 3.0