diff --git a/UD_any/evaluate.sh b/UD_any/evaluate.sh
index 3497493b3401707711a6afb74c5a1f2a05c77159..e3e3b42ba63b08d17dba91d72f32bab20d2af38c 100755
--- a/UD_any/evaluate.sh
+++ b/UD_any/evaluate.sh
@@ -37,22 +37,29 @@ fi
 
 TEST=$(find $UD_ROOT*$KEYWORD -type f -name '*test*.conllu')
 TESTRAW=$(find $UD_ROOT*$KEYWORD -type f -name '*test*.txt')
+DEV=$(find $UD_ROOT*$KEYWORD -type f -name '*dev*.conllu')
+DEVRAW=$(find $UD_ROOT*$KEYWORD -type f -name '*dev*.txt')
+TRAIN=$(find $UD_ROOT*$KEYWORD -type f -name '*train*.conllu')
+TRAINRAW=$(find $UD_ROOT*$KEYWORD -type f -name '*train*.txt')
 
-if has_space "$TEST";
+EVALTARGET=$DEV
+
+if has_space "$EVALTARGET";
 then
   >&2 echo "ERROR : more than 1 match with keyword" $KEYWORD
-  >&2 echo "TEST : " $TEST
+  >&2 echo "TEST : " $EVALTARGET
   print_usage_and_exit
 fi
 
-if test ! -f $TEST;
+if test ! -f $EVALTARGET;
 then
-  >&2 echo "ERROR : no test file found with keyword" $KEYWORD
-  >&2 echo "$TEST"
+  >&2 echo "ERROR : no target file found with keyword" $KEYWORD
+  >&2 echo "$EVALTARGET"
   print_usage_and_exit
 fi
 
 EVALCONLL="../scripts/conll18_ud_eval.py"
+OUTPUT=$EXPNAME"/predicted_eval.tsv"
 
-macaon_decode --model $EXPNAME --mcd $MCD --inputTSV $TEST $@ || exit 1
+macaon_decode --model $EXPNAME --mcd $MCD --inputTSV $EVALTARGET $@ > $OUTPUT && $EVALCONLL $EVALTARGET $OUTPUT -v || exit 1