Correct values in grid
Correct values the second
Merge conflicts resolved