Updated Gridmaker