Move to Normalize and a simpler, more robust grid.