More adjustments for speed