some changes
adaptation for grids
improving