yet another model change. changing api to math new modeling