updates to model/functions