Moved new grid stuff around