Even bigger map, and improved convergence