integrate the new grid system