Simplified the models by a lot