Add grids, improve genertor
