More performance and rewrites, simulations with larger data sets