fixed bug so any combination of age and cal data can be used
fixed conflict with kellis changes