changes for grid (uncompleted)