Improved finding the model