Made Changes to the Evaluate