evaluation: small modifications