few changes in gage handling