diff --git a/buildConfig/RegionChooser.bat b/buildConfig/RegionChooser.bat
index f28ebeed8e7a29d6734480426babef3e73350303..430ee7995efae8d4eb9422d91d568444d52ef8ca 100644
--- a/buildConfig/RegionChooser.bat
+++ b/buildConfig/RegionChooser.bat
@@ -1 +1,2 @@
-java -classpath lib/* -Xms512m -Xmx2g -Djava.util.logging.config.file=logging.properties eu.simstadt.regionchooser.RegionChooserFX
\ No newline at end of file
+java -classpath lib/* -Xms512m -Xmx2g -Djava.util.logging.config.file=logging.properties eu.simstadt.regionchooser.RegionChooserFX
+REM TODO: Update, similar to RegionChooser.sh
\ No newline at end of file
diff --git a/buildConfig/RegionChooser.command b/buildConfig/RegionChooser.command
index 95ccbc8fc351c686086e0ac2d571b287c7713bfb..02a02bd34072239804923e54a14d2b3406ec0281 100755
--- a/buildConfig/RegionChooser.command
+++ b/buildConfig/RegionChooser.command
@@ -1,3 +1,9 @@
 #!/bin/bash
-cd "$(dirname "$0")" # set the current working directory to the directory this script is in
-java -d64 -classpath lib/*: -Xms512m -Xmx2g -Djava.util.logging.config.file=logging.properties eu.simstadt.regionchooser.RegionChooserFX
+if [[ -z "$1" ]]
+  then
+	echo No parameter, launching RegionChooser GUI
+	java -classpath 'lib/*' eu.simstadt.regionchooser.RegionChooserFX
+  else
+	echo Launching RegionChooserCLI "$@"
+    java -classpath 'lib/*' eu.simstadt.regionchooser.RegionChooserCLI "$@"
+fi
\ No newline at end of file