evaluation reworked for new models