fixed all models to not repeat code