Major speed improvements.