Major speed-up.