diff --git a/scripts/windows/coco-dev-setup/batch/dev-setup.bat b/scripts/windows/coco-dev-setup/batch/dev-setup.bat
index a2bd051e0..160323dbf 100755
--- a/scripts/windows/coco-dev-setup/batch/dev-setup.bat
+++ b/scripts/windows/coco-dev-setup/batch/dev-setup.bat
@@ -15,6 +15,10 @@ IF EXIST "%PROGRAMFILES(X86)%" (
 :: TIPS
 :: 	+ Ask user if he wants to install something
 ::	+ Ask user to enter the path of the installed program (git, ...)
+
+:: TODO
+::  + Ask for all software if users wants to install it yes or no...
+::  + When user has git, or after git is installed, let him enter the path to the git exe
 	
 :: Create The Temporary Directory
 IF EXIST %temp-dir% rmdir %temp-dir% /s /q
@@ -55,9 +59,13 @@ for /L %%i in (1,%wc%,%languages_c%) do (
 )
 
 set "lang_id=-1"
-set /p lang_id= "Enter the language ID and press <ENTER>: "
+call:user_enter_language_id
 goto:user_pick_language
 
+:user_enter_language_id
+  set /p lang_id= "Enter the language ID and press <ENTER>: "
+goto:eof
+
 :user_pick_language
   set res=false
   if %lang_id% LSS 0 set res=true
@@ -65,7 +73,7 @@ goto:user_pick_language
   if "%res%"=="true" (
     call:log "Invalid id! Please enter a correct id from the numbers listed above..."
     call:draw_dss
-    set /p lang_id= "Enter the language ID and press <ENTER>: "
+    call:user_enter_language_id
     goto:user_pick_language
   )
   
@@ -81,7 +89,23 @@ call:log_lw_sse 2
 
 call:log_lw_sse 3
 
-call:install_software "git" "%%downloads[1]%%" exe
+call:log_lw 6
+call:log_lw 7
+call:log_lw 8
+call:get_lw word 9
+set /p result="%word% [Y/N]: "
+call:draw_dss
+set res=false
+if "%result%"=="N" set res=true
+if "%result%"=="n" set res=true
+if "%res%"=="true" (
+  call:install_software "git" "%%downloads[1]%%" exe
+) else (
+  call:log_lw 10
+)
+call:draw_dss
+call:get_lw word 11
+set /p git_exe_path="%word%: "
 
 :: [TODO] Add downloads for windows visual studio ?!
 
@@ -237,22 +261,22 @@ goto:eof
 
 :log_lw
   call:get_lw str %~1
-  call:log %str%
+  call:log "%str%"
 goto:eof
 
 :log_lw_ss
   call:get_lw str %~1
-  call:log_ss %str%
+  call:log_ss "%str%"
 goto:eof
 
 :log_lw_ds
   call:get_lw str %~1
-  call:log_ds %str%
+  call:log_ds "%str%"
 goto:eof
 
 :log_lw_sse
   call:get_lw str %~1
-  call:log_sse %str%
+  call:log_sse "%str%"
 goto:eof
 
 :: ============================== EOF ====================================
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/en b/scripts/windows/coco-dev-setup/batch/localisation/en
index fe4e94b6b..5b1ee6257 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/en
+++ b/scripts/windows/coco-dev-setup/batch/localisation/en
@@ -1,6 +1,12 @@
 English
-"Installation has begun, this can take a while... Please stay tuned..."
-"Don't close any windows please, unless specified explicitly."
-"[DOWNLOADING AND INSTALLING 3RD PARTY SOFTWARE]"
+Installation has begun, this can take a while... Please stay tuned...
+Don't close any windows please, unless specified explicitly.
+[DOWNLOADING AND INSTALLING 3RD PARTY SOFTWARE]
 downloading:
-installing:
\ No newline at end of file
+installing:
+CodeCombat is safely stored on a git repository.
+Therefore you need a git command-line application.
+Examples: git-bash, CygWin, ...
+Do you already have a git command-line application?
+Download and Installation cancelled...
+Enter the path to your Git CL Exectutable
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/fr b/scripts/windows/coco-dev-setup/batch/localisation/fr
index 3494e7b28..436e581f5 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/fr
+++ b/scripts/windows/coco-dev-setup/batch/localisation/fr
@@ -1,6 +1,12 @@
 fran�ais
-"Installation has begun, this can take a while... Please stay tuned..."
-"Don't close any windows please, unless specified explicitly."
-"[DOWNLOADING AND INSTALLING 3RD PARTY SOFTWARE]"
+Installation has begun, this can take a while... Please stay tuned...
+Don't close any windows please, unless specified explicitly.
+[DOWNLOADING AND INSTALLING 3RD PARTY SOFTWARE]
 downloading:
-installing:
\ No newline at end of file
+installing:
+CodeCombat is safely stored on a git repository.
+Therefore you need a git command-line application.
+Examples: git-bash, CygWin, ...
+Do you already have a git command-line application?
+Download and Installation cancelled...
+Enter the path to your Git CL Exectutable
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/nl b/scripts/windows/coco-dev-setup/batch/localisation/nl
index 1c0b5df4c..bf85aff8f 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/nl
+++ b/scripts/windows/coco-dev-setup/batch/localisation/nl
@@ -1,6 +1,12 @@
 Nederlands
-"Installatie is begonnen, dit kan een tijdje duren... Heb dus even geduld..."
-"Sluit geen enkel venster alstublieft, tenzij anders aangegeven is."
-"[3RD PARTY SOFTWARE AAN HET DOWNLOADEN EN INSTALLEREN]"
-downloaden:
-installeren:
\ No newline at end of file
+Installation has begun, this can take a while... Please stay tuned...
+Don't close any windows please, unless specified explicitly.
+[DOWNLOADING AND INSTALLING 3RD PARTY SOFTWARE]
+downloading:
+installing:
+CodeCombat is safely stored on a git repository.
+Therefore you need a git command-line application.
+Examples: git-bash, CygWin, ...
+Do you already have a git command-line application?
+Download and Installation cancelled...
+Enter the path to your Git CL Exectutable
\ No newline at end of file