fixing logic on evaluations again