Massive speed improvements