Added grid stuff