Update to grid implementation