Add in performance evaluation