adding in grid
fixing conflicts