Major speed improvements