redid initial models and associations