major speed improvements