diff --git a/car_net/stFlashClient/.idea/libraries/jcommander_1_48.xml b/car_net/stFlashClient/.idea/libraries/JSAP_2_1.xml
similarity index 53%
rename from car_net/stFlashClient/.idea/libraries/jcommander_1_48.xml
rename to car_net/stFlashClient/.idea/libraries/JSAP_2_1.xml
index a8478bb7b3c..c46e76642b9 100644
--- a/car_net/stFlashClient/.idea/libraries/jcommander_1_48.xml
+++ b/car_net/stFlashClient/.idea/libraries/JSAP_2_1.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
-  <library name="jcommander-1.48">
+  <library name="JSAP-2.1">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/jcommander-1.48.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/JSAP-2.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/car_net/stFlashClient/lib/JSAP-2.1.jar b/car_net/stFlashClient/lib/JSAP-2.1.jar
new file mode 100644
index 00000000000..15d1f37a788
Binary files /dev/null and b/car_net/stFlashClient/lib/JSAP-2.1.jar differ
diff --git a/car_net/stFlashClient/src/CommandLineArgs.java b/car_net/stFlashClient/src/CommandLineArgs.java
deleted file mode 100644
index 4bae7f67809..00000000000
--- a/car_net/stFlashClient/src/CommandLineArgs.java
+++ /dev/null
@@ -1,18 +0,0 @@
-import com.beust.jcommander.Parameter;
-
-/**
- * Created by user on 7/12/16.
- */
-public class CommandLineArgs {
-
-    @Parameter(names = { "-log", "-verbose" }, description = "Level of verbosity")
-    public Integer verbose = 1;
-
-    @Parameter(names = "-groups", description = "Comma-separated list of group names to be run")
-    public String groups;
-
-    @Parameter(names = "-debug", description = "Debug mode")
-    public boolean debug = false;
-
-
-}
diff --git a/car_net/stFlashClient/src/JCom.java b/car_net/stFlashClient/src/JCom.java
deleted file mode 100644
index 7ba4eab59c9..00000000000
--- a/car_net/stFlashClient/src/JCom.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import com.beust.jcommander.JCommander;
-
-/**
- * Created by user on 7/12/16.
- */
-public class JCom extends JCommander {
-}
diff --git a/car_net/stFlashClient/src/Main.kt b/car_net/stFlashClient/src/Main.kt
index b996da1e3e5..b2696f3f21b 100644
--- a/car_net/stFlashClient/src/Main.kt
+++ b/car_net/stFlashClient/src/Main.kt
@@ -1,5 +1,6 @@
-import com.beust.jcommander.JCommander
 import com.google.protobuf.ByteString
+import com.martiansoftware.jsap.FlaggedOption
+import com.martiansoftware.jsap.JSAP
 import io.netty.buffer.Unpooled
 import io.netty.handler.codec.http.*
 import io.netty.util.CharsetUtil
@@ -13,11 +14,20 @@ import java.util.*
 fun main(args: Array<String>) {
     //2 argm path to bin and server ip
     //1 option - 0x000...
-    var asss:ArrayList<String> = ArrayList();
 
-    val clArgs:CommandLineArgs = CommandLineArgs();
-    val jcom = JCommander(clArgs)
+    val jsap:JSAP = JSAP();
+    val optDebug = FlaggedOption("debug").setStringParser(JSAP.BOOLEAN_PARSER).setDefault("false").setRequired(false).setShortFlag('d')
+    val optDebug1 = FlaggedOption("verbose").setStringParser(JSAP.INTEGER_PARSER).setDefault("0").setRequired(true).setShortFlag('v')
+    jsap.registerParameter(optDebug)
+    jsap.registerParameter(optDebug1)
 
+    val config = jsap.parse(args)
+    println("verbose ${config.getInt("verbose")}")
+    println("debug ${config.getBoolean("debug")}")
+    println(jsap.getHelp())
+
+
+    System.exit(-1)
     val host = "127.0.0.1"
     val port = 8888
     val base = "0x08000000"
diff --git a/car_net/stFlashClient/stFlashClient.iml b/car_net/stFlashClient/stFlashClient.iml
index 326cdf6a85c..5d3c81ff468 100644
--- a/car_net/stFlashClient/stFlashClient.iml
+++ b/car_net/stFlashClient/stFlashClient.iml
@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" name="netty-all-4.1.2.Final-sources" level="project" />
-    <orderEntry type="library" name="jcommander-1.48" level="project" />
     <orderEntry type="library" name="protobuf-java-3.0.0-beta-3" level="project" />
+    <orderEntry type="library" name="JSAP-2.1" level="project" />
   </component>
 </module>
\ No newline at end of file