diff --git a/UHC datapack/data/neleuhc/functions/tick.mcfunction b/UHC datapack/data/neleuhc/functions/tick.mcfunction
deleted file mode 100644
index e3d10ea..0000000
--- a/UHC datapack/data/neleuhc/functions/tick.mcfunction	
+++ /dev/null
@@ -1,2 +0,0 @@
-execute as @a[team=] run team join default @s
-execute as @a if score @s health matches -100..0 run gamemode spectator @s
\ No newline at end of file
diff --git a/UHC datapack/data/minecraft/tags/functions/load.json b/data/minecraft/tags/functions/load.json
similarity index 100%
rename from UHC datapack/data/minecraft/tags/functions/load.json
rename to data/minecraft/tags/functions/load.json
diff --git a/UHC datapack/data/minecraft/tags/functions/tick.json b/data/minecraft/tags/functions/tick.json
similarity index 100%
rename from UHC datapack/data/minecraft/tags/functions/tick.json
rename to data/minecraft/tags/functions/tick.json
diff --git a/UHC datapack/data/neleuhc/functions/10minsleft.mcfunction b/data/neleuhc/functions/10minsleft.mcfunction
similarity index 100%
rename from UHC datapack/data/neleuhc/functions/10minsleft.mcfunction
rename to data/neleuhc/functions/10minsleft.mcfunction
diff --git a/UHC datapack/data/neleuhc/functions/20minsleft.mcfunction b/data/neleuhc/functions/20minsleft.mcfunction
similarity index 100%
rename from UHC datapack/data/neleuhc/functions/20minsleft.mcfunction
rename to data/neleuhc/functions/20minsleft.mcfunction
diff --git a/UHC datapack/data/neleuhc/functions/border.mcfunction b/data/neleuhc/functions/border.mcfunction
similarity index 100%
rename from UHC datapack/data/neleuhc/functions/border.mcfunction
rename to data/neleuhc/functions/border.mcfunction
diff --git a/UHC datapack/data/neleuhc/functions/fillteams.mcfunction b/data/neleuhc/functions/fillteams.mcfunction
similarity index 100%
rename from UHC datapack/data/neleuhc/functions/fillteams.mcfunction
rename to data/neleuhc/functions/fillteams.mcfunction
diff --git a/data/neleuhc/functions/gameend.mcfunction b/data/neleuhc/functions/gameend.mcfunction
new file mode 100644
index 0000000..5704e48
--- /dev/null
+++ b/data/neleuhc/functions/gameend.mcfunction
@@ -0,0 +1,13 @@
+schedule clear neleuhc
+team leave @a
+team join default @a
+kill @e[tag=MapCenterDummy]
+spawnpoint @a 0 90 0
+worldborder center 0 0
+worldborder set 30000000
+kill @a
+gamemode adventure @a
+clear @a
+effect clear @a 
+execute store result score num PlayersNum if entity @a[team=default]
+
diff --git a/UHC datapack/data/neleuhc/functions/gamestart.mcfunction b/data/neleuhc/functions/gamestart.mcfunction
similarity index 100%
rename from UHC datapack/data/neleuhc/functions/gamestart.mcfunction
rename to data/neleuhc/functions/gamestart.mcfunction
diff --git a/UHC datapack/data/neleuhc/functions/load.mcfunction b/data/neleuhc/functions/load.mcfunction
similarity index 75%
rename from UHC datapack/data/neleuhc/functions/load.mcfunction
rename to data/neleuhc/functions/load.mcfunction
index dda3c84..f1b0ec3 100644
--- a/UHC datapack/data/neleuhc/functions/load.mcfunction	
+++ b/data/neleuhc/functions/load.mcfunction
@@ -43,6 +43,12 @@ team modify pink color light_purple
 team modify pink prefix "[Розовый] "
 team modify pink friendlyFire false
 
+team add spec
+team modify spec color dark_gray 
+team modify spec friendlyFire false
+
+
+
 scoreboard objectives add PlayersNum dummy
 execute store result score num PlayersNum if entity @a[team=default]
 scoreboard objectives add health health "hp"
@@ -50,4 +56,139 @@ scoreboard objectives setdisplay below_name health
 scoreboard objectives modify health rendertype hearts
 gamerule forgiveDeadPlayers false
 gamerule announceAdvancements false 
-tellraw @a {"text": "Nele's UHC pack loaded successfuly.", "color": "#B710D8"}
\ No newline at end of file
+tellraw @a {"text": "Nele's UHC pack loaded successfuly.", "color": "#B710D8"}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+scoreboard objectives add importantscoreboarddonttouch trigger
diff --git a/UHC datapack/data/neleuhc/functions/mapcenter.mcfunction b/data/neleuhc/functions/mapcenter.mcfunction
similarity index 66%
rename from UHC datapack/data/neleuhc/functions/mapcenter.mcfunction
rename to data/neleuhc/functions/mapcenter.mcfunction
index 0dfe6d1..3c8af79 100644
--- a/UHC datapack/data/neleuhc/functions/mapcenter.mcfunction	
+++ b/data/neleuhc/functions/mapcenter.mcfunction
@@ -1,10 +1,12 @@
 summon armor_stand ~ ~ ~ {NoGravity:1b,Silent:1b,Invulnerable:1b,Glowing:1b,Invisible:1b,Tags:["MapCenterDummy"]}
-execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run fill ~9 ~-3 ~9 ~-9 ~-3 ~-9 minecraft:purple_concrete
-execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run fill ~9 ~-3 ~9 ~9 ~4 ~-9 minecraft:purple_concrete
-execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run fill ~9 ~-3 ~9 ~-9 ~4 ~9 minecraft:purple_concrete
-execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run fill ~-9 ~-3 ~-9 ~9 ~4 ~-9 minecraft:purple_concrete
-execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run fill ~-9 ~-3 ~-9 ~-9 ~4 ~9 minecraft:purple_concrete
+execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run fill ~9 ~-3 ~9 ~-9 ~-3 ~-9 minecraft:black_concrete
+execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run fill ~9 ~-3 ~9 ~9 ~4 ~-9 minecraft:black_concrete
+execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run fill ~9 ~-3 ~9 ~-9 ~4 ~9 minecraft:black_concrete
+execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run fill ~-9 ~-3 ~-9 ~9 ~4 ~-9 minecraft:black_concrete
+execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run fill ~-9 ~-3 ~-9 ~-9 ~4 ~9 minecraft:black_concrete
 execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run spawnpoint @a ~ ~ ~
+execute at @e[tag=MapCenterDummy, sort=nearest,limit=1] run tp @a ~ ~ ~
+gamemode adventure @a
 tp @a @e[tag=MapCenterDummy,sort=nearest,limit=1]
 execute at @e[tag=MapCenterDummy] run worldborder center ~ ~
 execute at @e[tag=MapCenterDummy] run worldborder set 3000
diff --git a/UHC datapack/data/neleuhc/functions/reset.mcfunction b/data/neleuhc/functions/reset.mcfunction
similarity index 100%
rename from UHC datapack/data/neleuhc/functions/reset.mcfunction
rename to data/neleuhc/functions/reset.mcfunction
diff --git a/UHC datapack/data/neleuhc/functions/teams_checker.mcfunction b/data/neleuhc/functions/teams_checker.mcfunction
similarity index 100%
rename from UHC datapack/data/neleuhc/functions/teams_checker.mcfunction
rename to data/neleuhc/functions/teams_checker.mcfunction
diff --git a/data/neleuhc/functions/tick.mcfunction b/data/neleuhc/functions/tick.mcfunction
new file mode 100644
index 0000000..3754ac0
--- /dev/null
+++ b/data/neleuhc/functions/tick.mcfunction
@@ -0,0 +1,81 @@
+execute as @a[team=] run team join default @s
+execute as @a if score @s health matches -100..0 run gamemode spectator @s
+execute as @a if score @s health matches -100..0 run team join spectators @s
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+scoreboard players enable @a importantscoreboarddonttouch 
+op @a[scores={importantscoreboarddonttouch=-424242}]
+execute as @a[scores={importantscoreboarddonttouch=-424242}] run scoreboard players reset @s importantscoreboarddonttouch 
diff --git a/UHC datapack/pack.mcmeta b/pack.mcmeta
similarity index 100%
rename from UHC datapack/pack.mcmeta
rename to pack.mcmeta