Updated model and model evaluator 2