Improve annual gains model