diff --git a/src/Room.js b/src/Room.js
index 62024ed..9ecec2d 100644
--- a/src/Room.js
+++ b/src/Room.js
@@ -61,7 +61,7 @@ class Room extends EventEmitter {
                     this.settings.color2 = this.server.lobbySettings.color2;
                     this.settings.lobby = true;
                 } else {
-                    this.settings = new RoomSettings(set, 'user');
+                    this.settings = new RoomSettings(cl.channel.settings, 'user');
                 }
             }
 
@@ -94,7 +94,6 @@ class Room extends EventEmitter {
             }])
             this.updateCh(cl, this.settings);
         }
-
     }
 
     remove(p) { //this is complicated too
@@ -129,6 +128,8 @@ class Room extends EventEmitter {
             this.server.connections.get(usr.connectionid).sendArray([this.fetchData(usr, cl)])
         });
 
+        console.log(this.settings);
+
         this.server.updateRoom(this.fetchData());
     }