diff --git a/peers/ProgramAB/en-US/aiml/jukebox.aiml b/peers/ProgramAB/en-US/aiml/jukebox.aiml
index fe55f88e..81edd492 100644
--- a/peers/ProgramAB/en-US/aiml/jukebox.aiml
+++ b/peers/ProgramAB/en-US/aiml/jukebox.aiml
@@ -2,143 +2,232 @@
 <aiml>
 <!-- File: jukebox.aiml -->
 <!--  -->
-<category><pattern>PLAY MUSIC</pattern>
-<template><srai>START PLAYLIST</srai></template>
-</category>
-
-<category><pattern>START PLAYLIST</pattern>
-<template><random>
-        <li>Starting play list now.</li>
-        <li>Great!</li>
-      </random>
-      <think><set name="playsong">ko</set></think>
-    <oob><mrl><service>python</service><method>exec</method><param>playMusic()</param></mrl></oob></template>
-</category>
-
-<category><pattern>START PLAYLIST *</pattern>
-<template><random>
-        <li>Starting playlist <star/> now.</li>
-        <li>Launching <star/> playlist.</li>
-      </random>
-      <think><set name="playsong">ko</set></think>
-    <oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.startPlaylist('<star/>')</param></mrl></oob></template>
-</category>
-
-<category><pattern>PLAY RANDOM MUSIC</pattern>
-<template><random>
-        <li>Selecting random music</li>
-        <li>Sure!</li>
-        <li>Ok!</li>
-      </random>
-      <think><set name="playsong">ko</set></think>
-    <oob><mrl><service>python</service><method>exec</method><param>playRandomMusic()</param></mrl></oob></template>
-</category>
-
-<category><pattern>STOP MUSIC</pattern>
-<template><srai>STOP PLAYLIST</srai></template>
-</category>
-
-<category><pattern>STOP THE MUSIC</pattern>
-<template><srai>STOP PLAYLIST</srai></template>
-</category>
-
-<category><pattern>STOP PLAYLIST</pattern>
-<template><random>
-        <li>As you please</li>
-        <li>Stopping playlist now</li>
-        <li>OK!</li>
-      </random>
-      <think><set name="playsong">ok</set></think>
-    <oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.stopPlaylist(), i01_audioPlayer.stop()</param></mrl></oob></template>
-</category>
-
-<category><pattern>PAUSE MUSIC</pattern>
-<template><random>
-        <li>Music in pause</li>
-        <li>Pausing music now</li>
-        <li>OK!</li>
-      </random>
-    <oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.pause()</param></mrl></oob></template>
-</category>
-
-<category><pattern>RESUME MUSIC</pattern>
-<template><random>
-        <li>Resuming music now</li>
-        <li>Sure!</li>
-      </random>
-    <oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.resume()</param></mrl></oob></template>
-</category>
-
-<category><pattern>SEARCH THE SONG *</pattern>
-<template>.
-  <think><set name="song"><star/></set><set name="playsong">ok</set></think>
-    <oob><mrl>
-      <service>python</service><method>exec</method><param>searchPlay("<get name="song"/>")</param>
-      </mrl></oob>
-      </template>
-</category>
-
-<category><pattern># NEXT SONG</pattern>
+  <category><pattern>PLAY MUSIC</pattern>
+    <template><srai>START PLAYLIST</srai></template>
+  </category>
+
+  <category><pattern>START PLAYLIST</pattern>
+    <template><random>
+          <li>Starting play list now.</li>
+          <li>Great!</li>
+        </random>
+        <think><set name="playsong">ko</set></think>
+      <oob><mrl><service>python</service><method>exec</method><param>playMusic()</param></mrl></oob></template>
+  </category>
+
+  <category><pattern>START PLAYLIST *</pattern>
+    <template><random>
+          <li>Starting playlist <star/> now.</li>
+          <li>Launching <star/> playlist.</li>
+        </random>
+        <think><set name="playsong">ko</set></think>
+      <oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.startPlaylist('<star/>')</param></mrl></oob></template>
+  </category>
+
+  <category><pattern>PLAY RANDOM MUSIC</pattern>
+    <template><random>
+          <li>Selecting random music</li>
+          <li>Sure!</li>
+          <li>Ok!</li>
+        </random>
+        <think><set name="playsong">ko</set></think>
+      <oob><mrl><service>python</service><method>exec</method><param>playRandomMusic()</param></mrl></oob></template>
+  </category>
+
+  <category><pattern>STOP MUSIC</pattern>
+    <template><srai>STOP PLAYLIST</srai></template>
+  </category>
+
+  <category><pattern>STOP THE MUSIC</pattern>
+    <template><srai>STOP PLAYLIST</srai></template>
+  </category>
+
+  <category><pattern>STOP PLAYLIST</pattern>
+    <template><random>
+          <li>As you please</li>
+          <li>Stopping playlist now</li>
+          <li>OK!</li>
+        </random>
+        <think><set name="playsong">ok</set></think>
+      <oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.stopPlaylist(), i01_audioPlayer.stop()</param></mrl></oob></template>
+  </category>
+
+  <category><pattern>PAUSE MUSIC</pattern>
+  <template><random>
+          <li>Music in pause</li>
+          <li>Pausing music now</li>
+          <li>OK!</li>
+        </random>
+      <oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.pause()</param></mrl></oob></template>
+  </category>
+
+  <category><pattern>RESUME MUSIC</pattern>
+  <template><random>
+          <li>Resuming music now</li>
+          <li>Sure!</li>
+        </random>
+      <oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.resume()</param></mrl></oob></template>
+  </category>
+
+  <category><pattern>SEARCH THE SONG *</pattern>
   <template>.
-    <think><get name = "playsong"></get></think>
+    <think><set name="song"><star/></set><set name="playsong">ok</set></think>
+      <oob><mrl>
+        <service>python</service><method>exec</method><param>searchPlay("<get name="song"/>")</param>
+        </mrl></oob>
+        </template>
+  </category>
+
+  <category><pattern># NEXT SONG</pattern>
+    <template>.
+      <think><get name = "playsong"></get></think>
+       <condition name="playsong" value="ok">
+          <oob><mrl><service>python</service><method>exec</method><param>nextPlay()</param></mrl></oob>
+      </condition>  
+      <condition name="playsong" value="ko">
+    <oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.stop()</param></mrl></oob>
+      </condition>
+    </template>
+  </category>
+
+  <category><pattern># PREVIOUS SONG</pattern>
+  <template>.
+   <think><get name = "playsong"></get></think>
      <condition name="playsong" value="ok">
-        <oob><mrl><service>python</service><method>exec</method><param>nextPlay()</param></mrl></oob>
-    </condition>  
+          <oob><mrl><service>python</service><method>exec</method><param>previousPlay()</param></mrl></oob>
+    </condition> 
     <condition name="playsong" value="ko">
-  <oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.stop()</param></mrl></oob>
-    </condition>  
-  </template>
-</category>
-
-<category><pattern># PREVIOUS SONG</pattern>
-<template>.
- <think><get name = "playsong"></get></think>
-   <condition name="playsong" value="ok">
-        <oob><mrl><service>python</service><method>exec</method><param>previousPlay()</param></mrl></oob>
-  </condition> 
-  <condition name="playsong" value="ko">
-    Previous do not work in Playlist mode, but only in search mode.
-  </condition> 
-  </template>
-</category>
-
-<category><pattern>VOLUME MUSIC LOUDER</pattern>
-<template>Setting music louder.<oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.setVolume(1.0)</param></mrl></oob></template>
-</category>
-<category><pattern>VOLUME MUSIC LOWER</pattern>
-<template>Setting music lower.<oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.setVolume(0.9)</param></mrl></oob></template>
-</category>
-<category><pattern>VOLUME MUSIC MORE LOW</pattern>
-<template>Setting music lower.<oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.setVolume(0.8)</param></mrl></oob></template>
-</category>
-        <category><pattern>PLAY RADIO</pattern>
-<template>Lets stream FIP radio.  
-        <oob>
-          <mrl>
-            <service>webgui</service>
-            <method>startBrowser</method>
-            <param>http://direct.fipradio.fr/live/fip-midfi.mp3</param>
-          </mrl>
-        </oob></template>
-</category>
-
-<category><pattern>SYSTEM_NEXT_SONG</pattern>
-<template><oob><mrl><service>python</service><method>exec</method><param>nextPlay()</param></mrl></oob></template>
-</category>
-
-<category><pattern>NEXT_SONG</pattern>
-<template>Here is the song.</template>
-</category>
-
-<category><pattern>DO_NOT_HAVE_SONG</pattern>
-<template>I do not have this song in my listes or the file contains upper case letters.</template>
-</category>
-
-<category><pattern>DO_NOT_HAVE_PLAYLIST</pattern>
-<template>I do not have a playlist configured by default.</template>
-</category>
-
-<category><pattern>END_PLAYLIST</pattern>
-<template>I have reached the end of my playlist. I restart from the beginning</template>
-</category>
+      Previous do not work in Playlist mode, but only in search mode.
+    </condition> 
+    </template>
+  </category>
+
+  <category><pattern>VOLUME MUSIC LOUDER</pattern>
+    <template>Setting music louder.<oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.setVolume(1.0)</param></mrl></oob></template>
+  </category>
+
+  <category><pattern>VOLUME MUSIC LOWER</pattern>
+    <template>Setting music lower.<oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.setVolume(0.9)</param></mrl></oob></template>
+  </category>
+
+  <category><pattern>VOLUME MUSIC MORE LOW</pattern>
+    <template>Setting music lower.<oob><mrl><service>python</service><method>exec</method><param>i01_audioPlayer.setVolume(0.8)</param></mrl></oob></template>
+  </category>
+
+  <category>
+    <pattern>* RADIO *</pattern>
+    <template>Okay, I am looking for radio <star index="2"/>.
+      <think><set name="radio"><star index="2"/></set></think>
+     <condition name="radio">
+      <li value="france info"><think><set name="radio">"http://direct.franceinfo.fr/live/franceinfo-midfi.mp3"</set></think></li>
+      <li value="france inter"><think><set name="radio">"http://direct.franceinter.fr/live/franceinter-midfi.mp3"</set></think></li>
+      <li value="fip"><think><set name="radio">"http://direct.fipradio.fr/live/fip-webradio4.mp3"</set></think></li>
+      <li value="rire et chansons"><think><set name="radio">"http://cdn.nrjaudio.fm/adwz1/fr/30407/mp3_128.mp3?origine=fluxradios"</set></think></li>
+      <li value="france"><think><set name="radio">"http://icecast.radiofrance.fr/francemusiqueconcertsradiofrance-midfi.mp3"</set></think></li>
+      <li value="chérie fm"><think><set name="radio">"http://cdn.nrjaudio.fm/adwz1/fr/55495/mp3_128.mp3"</set></think></li>
+      <li value="europe 1"><think><set name="radio">"http://wr.lmn.fm/e1-wr5.mp3"</set></think></li>
+      <li value="jazz"><think><set name="radio">"http://jazz-wr01.ice.infomaniak.ch/jazz-wr01-128.mp3"</set></think></li>
+      <li value="nostalgie"><think><set name="radio">"http://cdn.nrjaudio.fm/adwz1/fr/30605/mp3_128.mp3?"</set></think></li>
+      <li value="nrj"><think><set name="radio">"http://cdn.nrjaudio.fm/adwz2/fr/30001/mp3_128.mp3?origine=fluxradios"</set></think></li>
+      <li value="rfm"><think><set name="radio">"http://rfm.lmn.fm/rfm.mp3"</set></think></li>
+      <li value="rtl"><think><set name="radio">"http://streaming.radio.rtl.fr:80/rtl-1-44-128?listen=webCwsBCggNCQgLDQUGBAcGBg"</set></think></li>
+      <li value="france bleu"><think><set name="radio">"http://direct.francebleu.fr/live/fbazur-midfi.mp3"</set></think></li>
+    <li value="*" ><think><set name="radio">" "</set></think></li>
+    </condition>
+      <oob>
+        <mrl>
+          <service>python</service>
+          <method>exec</method>
+          <param>startRadio(<get name="radio"/>)</param>
+        </mrl>
+      </oob>
+    <srai>APPSMILE</srai>
+    </template>
+  </category>
+
+  <category><pattern>* GROOVE MUSIC</pattern>
+    <template>Here is some grooving music.
+      <oob>
+        <mrl>
+          <service>python</service>
+          <method>exec</method>
+          <param>startRadio("http://jazz-wr08.ice.infomaniak.ch/jazz-wr08-128.mp3")</param>
+        </mrl>
+      </oob>
+    <srai>APPSMILE</srai>
+    </template>
+  </category>
+
+  <category><pattern>STOP THE RADIO</pattern>
+    <template>Okay, I stop the radio.
+      <oob>
+        <mrl>
+          <service>python</service>
+          <method>exec</method>
+          <param>stopRadio()</param>
+        </mrl>
+      </oob>
+    <srai>APPSMILE</srai>
+    </template>
+  </category>
+
+  <category><pattern>* NAME * PLAYLIST</pattern>
+    <template> 
+      <oob>
+        <mrl>
+          <service>python</service>
+          <method>exec</method>
+          <param>authorPlaylist()</param>
+        </mrl>
+      </oob>
+    </template>
+  </category>
+
+  <category><pattern>* AUTHOR * PLAYLIST</pattern>
+    <template>
+      <srai><star> NAME <star index="2"/> PLAYLIST</srai>
+    </template>
+  </category>
+
+  <category><pattern>SYSTEM_NEXT_SONG</pattern>
+    <template>
+      <oob>
+        <mrl>
+          <service>python</service>
+          <method>exec</method>
+          <param>nextPlay()</param>
+        </mrl>
+      </oob>
+    </template>
+  </category>
+
+  <category><pattern>NEXT_SONG</pattern>
+    <template>Here is the song.
+    </template>
+  </category>
+
+  <category><pattern>DO_NOT_HAVE_SONG</pattern>
+    <template>I do not have this song in my listes or the file contains upper case letters.
+    </template>
+  </category>
+
+  <category><pattern>DO_NOT_HAVE_PLAYLIST</pattern>
+    <template>I do not have a playlist configured by default.
+    </template>
+  </category>
+
+  <category><pattern>END_PLAYLIST</pattern>
+    <template>I have reached the end of my playlist. I restart from the beginning
+    </template>
+  </category>
+
+  <category><pattern>DO_NOT_HAVE_RADIO</pattern>
+    <template>I don't know this radio.
+    </template>
+  </category>
+
+  <category><pattern>BEGIN_PLAYLIST</pattern>
+    <template>You are already at the beginning of the playlist. I stay at the beginning of the list.
+    </template>
+  </category>
 </aiml>