diff --git a/eval.sh b/eval.sh
index 4696a0fc7f2b9a5ebe77538e21a150b9160d9eac..3c053334bda03dd69dc65973b802eab0c99acb71 100755
--- a/eval.sh
+++ b/eval.sh
@@ -15,7 +15,7 @@ COMMON_ARGS=(
   --color_map "${CONFIG_PATH}/${COLOR_MAP_FILENAME}"
   --use_separate_channels $USE_SEPARATE_CHANNELS
   --batch_size 10
-  --eval_set_size 10
+  --eval_set_size $EVAL_SET_SIZE
   --max_steps 0
   --write_predictions
   ${TRAINING_ARGS[@]}
diff --git a/prepare-shell.sh b/prepare-shell.sh
index aecad55672a3682565f04f0e786eea5b6c736da8..38fcf1cd303c208ca7e1cfb83f70d0b171d257e4 100755
--- a/prepare-shell.sh
+++ b/prepare-shell.sh
@@ -13,6 +13,7 @@ export LOCAL_PATH_ROOT="./.models"
 export BUCKET="gs://${PROJECT}-ml"
 export COLOR_MAP_FILENAME="color_map.conf"
 export USE_SEPARATE_CHANNELS=true
+export DATASET_SUFFIX=
 
 export USE_CLOUD=false
 
@@ -40,16 +41,16 @@ fi
 # cloud paths
 export GCS_SUB_PROJECT_PATH="${BUCKET}/${SUB_PROJECT_NAME}"
 export GCS_PATH="${GCS_SUB_PROJECT_PATH}/${MODEL_NAME}/${VERSION_NAME}"
-export GCS_DATA_PATH="${GCS_PATH}/data"
+export GCS_DATA_PATH="${GCS_PATH}/data${DATASET_SUFFIX}"
 export GCS_CONFIG_PATH="${GCS_PATH}/config"
-export GCS_PREPROC_PATH="${GCS_PATH}/preproc"
+export GCS_PREPROC_PATH="${GCS_PATH}/preproc${DATASET_SUFFIX}"
 export GCS_TRAIN_MODEL_PATH="${GCS_PATH}${TRAINING_SUFFIX}/training"
 
 # local paths
 export LOCAL_MODEL_PATH="${LOCAL_PATH_ROOT}/${MODEL_NAME}/${VERSION_NAME}"
-export LOCAL_DATA_PATH="${LOCAL_MODEL_PATH}/data"
+export LOCAL_DATA_PATH="${LOCAL_MODEL_PATH}/data${DATASET_SUFFIX}"
 export LOCAL_CONFIG_PATH="."
-export LOCAL_PREPROC_PATH="${LOCAL_MODEL_PATH}/preproc"
+export LOCAL_PREPROC_PATH="${LOCAL_MODEL_PATH}/preproc${DATASET_SUFFIX}"
 export LOCAL_TRAIN_MODEL_PATH="${LOCAL_MODEL_PATH}${TRAINING_SUFFIX}/training"
 
 echo "USE_CLOUD: $USE_CLOUD"