more eval changes