Changed models, added interaction terms