UPdating Evaluate.java