Updated for GCAM (1.7.6.1)