More work on grid