Some massive speed improvements.