diff --git a/code/piplayer4.py b/code/piplayer4.py
index cf39d00..983b639 100644
--- a/code/piplayer4.py
+++ b/code/piplayer4.py
@@ -27,8 +27,8 @@ PIN_LED = 22
 
 # Buttons on PINs 9, 10 and 11
 PIN_PREV = 9
-PIN_PLAY = 10
-PIN_NEXT = 11
+PIN_NEXT = 10
+PIN_PLAY = 11
 
 
 GPIO.setmode(GPIO.BCM)
@@ -51,6 +51,7 @@ def play(uri, service = 'mpd'):
 def prev_callback(channel):
     logging.info("PREV")
     socketIO.emit('prev')
+    ## TODO implement jump to beginning for first x seconds (or if first track)
     ## TODO implement seek
      
 def play_callback(channel):
@@ -127,7 +128,7 @@ try:
                     qr_code = qr_code[1:]
                 full_path = MUSIC_BASE_DIRECTORY + qr_code
                 logging.info("full_path: " + full_path)
-                play(full_path)
+                play(full_path, 'mpd')
             
         else:
             logging.warning('Timeout on zbarcam')