fixed all models. optimizing to do