Updated the Gauge class