massive speed improvements, better generation