Updated gridmaker