diff --git a/bin/__pycache__/player.cpython-310.pyc b/bin/__pycache__/player.cpython-310.pyc
index 89b42d2..f161585 100644
Binary files a/bin/__pycache__/player.cpython-310.pyc and b/bin/__pycache__/player.cpython-310.pyc differ
diff --git a/bin/__pycache__/servercoms.cpython-310.pyc b/bin/__pycache__/servercoms.cpython-310.pyc
index ac07f87..602fbab 100644
Binary files a/bin/__pycache__/servercoms.cpython-310.pyc and b/bin/__pycache__/servercoms.cpython-310.pyc differ
diff --git a/bin/player.py b/bin/player.py
index 9c92aaa..f9cd428 100755
--- a/bin/player.py
+++ b/bin/player.py
@@ -83,7 +83,7 @@ class Player:
                 self.current_playing_pos += 1
                 mx.music.load(self.current_playing)
                 mx.music.play()
-                self.__recent_change = 1000000
+                self.__recent_change = 20
                 self.infoupdater()
 
             elif other.value == 2:
@@ -93,7 +93,7 @@ class Player:
                 other.value = 0
 
             elif other.value == 3:
-                self.__recent_change = 1000000
+                self.__recent_change = 20
                 other.value = 0
 
             elif other.value == 4:
@@ -109,7 +109,7 @@ class Player:
                 self.current_playing = self.playlist.pop(0)
                 mx.music.load(self.current_playing)
                 mx.music.play()
-                self.__recent_change = 10000000
+                self.__recent_change = 20
                 self.infoupdater()
             else:
                 if inst.value == 1:
@@ -119,20 +119,23 @@ class Player:
             # Main event-checking part
             if mx.music.get_busy() is False and inst.value == 1 and self.__recent_change == 0:
                 mx.music.unload()
-                if config["Playback"]["loopPlayback"] == "0":
+                print("stopped playing")
+                if config["Playback"]["autoplay"] == "0":
                     pass
                 else:
+                    print("playing next song")
                     if len(self.playlist) > 0:
                         pass
-                    else:
+                    elif config["Playback"]["loopPlayback"] == "1":
                         self.playlist = copy.deepcopy(self.playlist_backup)
                         self.current_playing_pos = -1
+                    else:
+                        pass
                     self.current_playing = self.playlist.pop(0)
                     self.current_playing_pos += 1
                     mx.music.load(self.current_playing)
                     mx.music.play()
-                    self.__recent_change = 10000000
+                    self.__recent_change = 20
                     self.infoupdater()
             else:
-                pass
-            time.sleep(0.2)
+                time.sleep(0.2)
diff --git a/data/settings.ini b/data/settings.ini
index c55cb05..0bc7bdf 100755
--- a/data/settings.ini
+++ b/data/settings.ini
@@ -13,6 +13,7 @@ launchMaximized = True
 [Playback]
 # Choose if you want the playback to loop at the end (1 for True, 0 for False)
 loopPlayback = 1
+autoplay = 1
 
 [Security]
 # Specifies if a password should be used for exiting the fullscreen mode on the showcase screen
diff --git a/data/songtemp.csv b/data/songtemp.csv
index 7a5bba3..4c2cc73 100755
--- a/data/songtemp.csv
+++ b/data/songtemp.csv
@@ -1,3 +1,3 @@
-0
-Lupus Nocte - Hadouken (Royalty Free Music).mp3,Minecraft OST - Pigstep.mp3,The Day You Went Away.mp3,sha la la.mp3
-163.7987518310547
+1
+18-bye-have-a-great-time.mp3,Applause Wav Sound Effects.mp3,Big_Explosion_Cut_Off.mp3,Big_Explosion_Distant.mp3,Big_Explosion_Sweeping_In.mp3,Bruh Sound Effect.mp3,Bullet_hit_car.mp3,Explosion_Hiss_Bop_Bang.mp3,JUST DO IT Sound Effect.mp3,Long_Rifle_Shots.mp3,M4_Shots.mp3,Strong_Punch-Mike_Koenig-574430706.mp3,are-you-sure-about-that.mp3,bass-boost_mD5uYk1.mp3,bye_imPxcXs.mp3,byebye_v3Dt9ad.mp3,engineer_no01.mp3,hellothere_uIgLvnP.mp3,minion_laughing.mp3,nooo.swf.mp3,obi-wan-hello-there.mp3,oh_no_1.mp3,risitas.mp3,well-be-right-back.mp3
+8.150203704833984
diff --git a/data/temp.csv b/data/temp.csv
index 410a3c6..85c5560 100755
--- a/data/temp.csv
+++ b/data/temp.csv
@@ -1 +1 @@
-/mnt/storage/SORTED/Music
+/mnt/storage/SORTED/Music/Videos/Memes + Soundeffect/