Some changes to start with the grid