Moved uncertainty calculation to before performance evaluation