Updated to more sophisticated evaluation