Added storing of evaluate results to improve performance... maybe?