rerun all models
cleaned up