minor modification to eval