Change around to fit modern grids