More speed-ups