changes to handevaluator