Some hacks added to the grid :P