diff --git a/jail_audio.cpp b/jail_audio.cpp
index c1d4002..0f29982 100644
--- a/jail_audio.cpp
+++ b/jail_audio.cpp
@@ -46,7 +46,7 @@ float               JA_soundVolume[JA_MAX_GROUPS];
 bool                JA_musicEnabled { true };
 bool                JA_soundEnabled { true };
 SDL_AudioDeviceID   sdlAudioDevice  { 0 };
-SDL_TimerID         JA_timerID      { 0 };
+//SDL_TimerID         JA_timerID      { 0 };
 
 bool fading = false;
 int fade_start_time;
@@ -54,7 +54,7 @@ int fade_duration;
 int fade_initial_volume;
 
 
-Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval)
+void JA_Update()
 {
     if (JA_musicEnabled && current_music && current_music->state == JA_MUSIC_PLAYING)
     {
@@ -63,7 +63,7 @@ Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval)
             if (time > (fade_start_time+fade_duration)) {
                 fading = false;
                 JA_StopMusic();
-                return 30;
+                return;
             } else {
                 const int time_passed = time - fade_start_time;
                 const float percent = (float)time_passed / (float)fade_duration;
@@ -104,7 +104,7 @@ Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval)
 
     }
 
-    return 30;
+    return;
 }
 
 void JA_Init(const int freq, const SDL_AudioFormat format, const int num_channels)
@@ -121,12 +121,12 @@ void JA_Init(const int freq, const SDL_AudioFormat format, const int num_channel
     for (int i=0; i<JA_MAX_SIMULTANEOUS_CHANNELS; ++i) channels[i].state = JA_CHANNEL_FREE;
     for (int i=0; i<JA_MAX_GROUPS; ++i) JA_soundVolume[i] = 0.5f;
     //SDL_PauseAudioDevice(sdlAudioDevice);
-    JA_timerID = SDL_AddTimer(30, JA_UpdateCallback, nullptr);
+    //JA_timerID = SDL_AddTimer(30, JA_UpdateCallback, nullptr);
 }
 
 void JA_Quit()
 {
-    if (JA_timerID) SDL_RemoveTimer(JA_timerID);
+    //if (JA_timerID) SDL_RemoveTimer(JA_timerID);
 
     if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice);
     sdlAudioDevice = 0;
diff --git a/jail_audio.h b/jail_audio.h
index 035b5cb..716b7f9 100644
--- a/jail_audio.h
+++ b/jail_audio.h
@@ -7,6 +7,8 @@ enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MU
 struct JA_Sound_t;
 struct JA_Music_t;
 
+void JA_Update();
+
 void JA_Init(const int freq, const SDL_AudioFormat format, const int num_channels);
 void JA_Quit();
 
diff --git a/main.cpp b/main.cpp
index 87aac8a..70aa4a4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -31,10 +31,10 @@ int main(int argc, char **argv) {
                         JA_PlaySound(peiv);
                         break;
                     case SDL_SCANCODE_3:                // Si pulsem la tecla '3' sona el wav 3 vegades
-                        JA_PlaySound(peiv, 2);
+                        JA_PlaySound(peiv, 2, 1);
                         break;
                     case SDL_SCANCODE_4:                // Si pulsem la tecla '4' sona el wav infinitament
-                        channel = JA_PlaySound(peiv, -1);
+                        channel = JA_PlaySound(peiv, -1, 2);
                         break;
                     case SDL_SCANCODE_5:                // Si pulsem la tecla '5' pausem o despausem el wav que sonaba infinitament
                         if (JA_GetChannelState(channel) == JA_CHANNEL_PLAYING) { JA_PauseChannel(channel); } else { JA_ResumeChannel(channel); }
@@ -63,6 +63,7 @@ int main(int argc, char **argv) {
                 
             }
         }
+        JA_Update();
     }
     JA_DeleteSound(peiv);
     JA_DeleteMusic(music);