diff --git a/elements/player_hand.tscn b/elements/player_hand.tscn
index 87f9d8f..a4805d0 100644
--- a/elements/player_hand.tscn
+++ b/elements/player_hand.tscn
@@ -7,6 +7,43 @@
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ksc6e"]
 albedo_color = Color(0.84, 0.4725, 0.21, 1)
 
+[sub_resource type="Animation" id="Animation_j3yk6"]
+length = 0.001
+loop_mode = 1
+tracks/0/type = "bezier"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath(".:position:x")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"handle_modes": PackedInt32Array(0),
+"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0),
+"times": PackedFloat32Array(0)
+}
+tracks/1/type = "bezier"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath(".:position:y")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"handle_modes": PackedInt32Array(0),
+"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0),
+"times": PackedFloat32Array(0)
+}
+tracks/2/type = "bezier"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath(".:position:z")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"handle_modes": PackedInt32Array(0),
+"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0),
+"times": PackedFloat32Array(0)
+}
+
 [sub_resource type="Animation" id="Animation_ksc6e"]
 resource_name = "hover"
 length = 2.0
@@ -45,43 +82,6 @@ tracks/2/keys = {
 "times": PackedFloat32Array(0, 1, 2)
 }
 
-[sub_resource type="Animation" id="Animation_j3yk6"]
-length = 0.001
-loop_mode = 1
-tracks/0/type = "bezier"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath(".:position:x")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"handle_modes": PackedInt32Array(0),
-"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0),
-"times": PackedFloat32Array(0)
-}
-tracks/1/type = "bezier"
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/path = NodePath(".:position:y")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/keys = {
-"handle_modes": PackedInt32Array(0),
-"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0),
-"times": PackedFloat32Array(0)
-}
-tracks/2/type = "bezier"
-tracks/2/imported = false
-tracks/2/enabled = true
-tracks/2/path = NodePath(".:position:z")
-tracks/2/interp = 1
-tracks/2/loop_wrap = true
-tracks/2/keys = {
-"handle_modes": PackedInt32Array(0),
-"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0),
-"times": PackedFloat32Array(0)
-}
-
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_v6rd7"]
 _data = {
 &"RESET": SubResource("Animation_j3yk6"),
diff --git a/environment_manager.gd b/environment_manager.gd
index b7b867b..f728f03 100644
--- a/environment_manager.gd
+++ b/environment_manager.gd
@@ -71,19 +71,19 @@ func _on_web_client_tcp_client_order_received(playing_order: Array[ClientData])
 	for index in new_ids.size():
 		_bets[new_ids[index]] = []
 		var hand: PlayerHand
-		if client_ids[index] == _own_client_id:
+		if new_ids[index] == _own_client_id:
 			hand = own_player_hand
 		else:
 			hand = player_hand_scene.instantiate()
 			var client_data: ClientData
 			for client in playing_order:
-				if client.client_id == client_ids[index]:
+				if client.client_id == new_ids[index]:
 					client_data = client
 					break
 			hand.set_player_data(client_data) # also for own hand?
 			marker_positions[index - 1].add_child(hand)
 		
-		hand_associations[client_ids[index]] = hand
+		hand_associations[new_ids[index]] = hand
 
 func _on_web_client_tcp_cards_received(cards: Dictionary) -> void:
 	for client_id in cards.keys():