more updates to evaluation logic