working on the better eval