added grids
merged changes