diff --git a/source/default_mp.cfg b/source/default_mp.cfg
index ab451ca..406bd2c 100644
--- a/source/default_mp.cfg
+++ b/source/default_mp.cfg
@@ -7,7 +7,7 @@ sets _match_team2	"-"
 sets _match_score	"-"
 sets _match_round	"-"
 
-sets _zpam "3.32" // ZPAM_RENAME
+sets _zpam "3.33-LAN" // ZPAM_RENAME
 
 
 
diff --git a/source/images/a_training_target.iwi b/source/images/a_training_target.iwi
new file mode 100644
index 0000000..2d35897
Binary files /dev/null and b/source/images/a_training_target.iwi differ
diff --git a/source/maps/mp/gametypes/_aim_trainer.gsc b/source/maps/mp/gametypes/_aim_trainer.gsc
new file mode 100644
index 0000000..b7b8120
--- /dev/null
+++ b/source/maps/mp/gametypes/_aim_trainer.gsc
@@ -0,0 +1,765 @@
+#include maps\mp\gametypes\global\_global;
+
+/*
+Map may contain targets that players can use to practise their aim
+Names of entities:
+	Targets (array of targets):
+	- "trainer_target" - image of target
+	- "trainer_trigger" - trigger_damage
+
+	Activators (2 per map - for allies and axis):
+	- "trainer_ground" - image of target activator
+	- "trainer_ground_trigger" - trigger_damage
+*/
+
+Init()
+{
+	addEventListener("onConnected",     ::onConnected);
+        addEventListener("onDisconnect",    ::onDisconnect);
+	addEventListener("onSpawned",    ::onSpawned);
+
+	level.aimTargets = [];
+
+	// Load targets and activators
+	targets = 		getentarray("trainer_target", "targetname");
+	targets_damage = 	getentarray("trainer_trigger", "targetname");
+	activators = 		getent("trainer_activator", "targetname");
+	activators_damage = 	getentarray("trainer_activator_damage", "targetname");
+	activators_hint = 	getentarray("trainer_activator_hint", "targetname");
+/*
+	println("## trainer_target = " + targets.size);
+	println("## trainer_trigger = " + targets_damage.size);
+	println("## trainer_activator = " + isDefined(activators));
+	println("## trainer_activator_damage = " + activators_damage.size);
+	println("## trainer_activator_hint = " + activators_hint.size);
+*/
+	if (targets.size == 0 || !isDefined(activators))
+		return;
+	if (targets.size != targets_damage.size)
+		return;
+
+
+	// Not allowed -> delete
+	if (!level.in_readyup)
+	{
+		for (i = 0; i < targets.size; i++)
+		{
+			targets[i] delete();
+			targets_damage[i] delete();
+		}
+		for (i = 0; i < activators.size; i++)
+		{
+			activators_damage[i] delete();
+			activators_hint[i] delete();
+		}
+		activators delete();
+		return;
+	}
+
+
+
+	level._effect["aimTargetExplosion"] = loadfx("fx/impacts/large_metalhit.efx");
+
+
+
+	for (i = 0; i < targets.size; i++)
+	{
+		targets_damage[i] enablelinkto();
+		targets_damage[i] linkTo(targets[i]);
+		targets_damage[i].parent = targets[i];
+
+		targets[i] notsolid();
+		targets[i].trigger_damage = targets_damage[i];
+		targets[i].origin_original = targets[i].origin;
+		//targets[i].trigger_damage thread debugDamage("["+i+"]");
+		//targets[i] thread maps\mp\gametypes\global\developer::showWaypoint();
+	}
+
+
+	for (i = 0; i < activators_damage.size; i++)
+	{
+		//activators[i] notsolid();
+		activators_damage[i] thread handleActivation();
+	}
+
+
+	level.aimTargets = targets;
+
+	println("## level.aimTargets = " + level.aimTargets.size); // TODO
+}
+
+onConnected()
+{
+	self.aimTrainerMode = 0;
+	self.aimTrainer_outOfAmmo = false;
+	self.aimTrainer_startAngles = (0, 0, 0);
+}
+
+
+onDisconnect()
+{
+	self turnOff();
+}
+
+onSpawned()
+{
+	self turnOff();
+}
+
+
+
+reserveTargetBy(player)
+{
+	for (i = 0; i < level.aimTargets.size; i++)
+	{
+		target = level.aimTargets[i];
+
+		if (!isDefined(target.reservedBy))
+		{
+			target.reservedBy = player;
+
+			//player iprintln("reserving index " + i);
+
+			return target;
+		}
+	}
+	return undefined;
+}
+
+releaseTarget()
+{
+	target = self;
+
+	target hide();
+	target.reservedBy = undefined;
+	target.origin = target.origin_original;
+
+	target notify("aim_trainer_target_released");
+}
+
+rotateTowards(player)
+{
+	target = self;
+
+	target endon("aim_trainer_target_released");
+
+	for (;;)
+	{
+		if (!isDefined(target) || !isDefined(player))
+			return;
+
+		angles = vectortoangles(player.origin - target.origin);
+
+		target.angles = (0, angles[1] + 180, 0);
+
+		wait level.frame;
+		waittillframeend;
+	}
+}
+
+
+
+debugDamage(name)
+{
+	for(;;)
+	{
+		self waittill("damage", dmg, player);
+
+		iprintln("Damage " + dmg + " to " + name + " by " + player.name);
+	}
+}
+
+handleDamageForPlayer(player)
+{
+	target = self;
+
+	target endon("aim_trainer_target_released");
+
+	for(;;)
+	{
+		target.trigger_damage waittill("damage", dmg, attacker);
+
+		// Ignore damages for other players
+		if (attacker != player)
+			continue;
+
+		player thread maps\mp\gametypes\_damagefeedback::updateDamageFeedback(undefined, 1);
+
+		player thread generateMeNewTargetPosition("kill");
+	}
+}
+
+handleActivation()
+{
+	activator_damage = self;
+
+	for(;;)
+	{
+		activator_damage waittill("damage", dmg, player);
+
+		player thread maps\mp\gametypes\_damagefeedback::updateDamageFeedback(undefined, 1);
+
+		//player toggle();
+
+		player iprintlnbold("Aim trainer");
+		player iprintlnbold("Hold ^3[{+melee_breath}] ^7to enable / switch modes.");
+		player iprintlnbold("Double press ^3[{+melee_breath}] ^7to disable.");
+		player iprintlnbold(" ");
+		player iprintlnbold(" ");
+	}
+}
+
+
+setKillTimeout(seconds, player)
+{
+	target = self;
+
+	target endon("aim_trainer_target_released");
+	target notify("aim_trainer_kill_timeout");
+	target endon("aim_trainer_kill_timeout");
+
+	wait level.fps_multiplier * seconds;
+
+	player iprintln("^1Time to kill elapsed!");
+
+	player thread generateMeNewTargetPosition("missed");
+}
+
+
+
+
+
+getTargetPos(randomize)
+{
+	eye = self maps\mp\gametypes\global\player::getEyeOrigin();
+	angles = self getPlayerAngles();
+	fov = self getFOV() / 80;
+
+
+
+	// Make sure the target is always visible on screen
+	angles_new = angles;
+	if (randomize)
+	{
+		angleDiff = angles[1] - self.aimTrainer_startAngles[1];
+		if (angleDiff > 180)		angleDiff -= 360;
+		else if (angleDiff < -180)	angleDiff += 360;
+
+		// Player is not looking to startAngles direction, save new
+		if (angleDiff < -45 || angleDiff > 45)
+			self.aimTrainer_startAngles = angles;
+
+		// left +, right -, max 40
+		left_right = randomint(40) - 20; // -20 <-> 19
+		left_right *= fov;
+		left_right += self.aimTrainer_startAngles[1];
+
+		// up -, down +
+		up_down = randomint(14) - 8; // -8 <-> 5
+		up_down *= fov;
+
+		// In center put target always above weapon target
+		if (up_down > angles[0] && self playerAds() > 0 && !maps\mp\gametypes\_weapons::isSniper(self getcurrentweapon()))
+		{
+			left_right_diff = (angles[1] - left_right);
+			if (left_right_diff > -10 && left_right_diff <= 0)
+			{
+				left_right += 10;
+				//iprintln("adjusted target more to the left");
+
+			}
+			else if (left_right_diff < 10 && left_right_diff > 0)
+			{
+				left_right -= 10;
+				//iprintln("adjusted target more to the right");
+			}
+		}
+
+
+		angles_new = (up_down, left_right, 0);
+	}
+
+	distance = 200 + (800 - (800 * fov));
+
+	forward = anglesToForward(angles_new);
+	forwardMultiplier = distance;
+
+	forwardOrigin = eye + (forward[0] * forwardMultiplier, forward[1] * forwardMultiplier, forward[2] * forwardMultiplier);
+
+
+	forwardTrace = Bullettrace(eye, forwardOrigin, false, self); // BulletTrace( <start>, <end>, <hit characters>, <ignore entity> )
+	forwardTracedOrigin = forwardTrace["position"];
+
+
+	vector = (forwardTracedOrigin - eye);
+
+	vectorNorm = VectorNormalize(vector);
+	vectorLen = length(vector);
+
+	multiplier = vectorLen * 0.8;
+
+	newPos = eye + (vectorNorm[0] * multiplier, vectorNorm[1] * multiplier, vectorNorm[2] * multiplier);
+
+	return newPos;
+}
+
+moving(speed)
+{
+	target = self;
+
+	target endon("aim_trainer_target_released");
+	target endon("aim_trainer_target_updated");
+
+	// Wait till properly rotated and spawned
+	waittillframeend;
+
+	// Generate moving direction
+	right = anglesToRight(target.angles);
+	distance = 100; // to both sides
+
+	origin_original = target.origin;
+	origin_right = target.origin + (right[0] * distance, right[1] * distance, right[2] * distance);
+	origin_left = target.origin + (right[0] * distance * -1, right[1] * distance * -1, right[2] * distance * -1);
+
+	rightTrace = Bullettrace(origin_original, origin_right, false, target); // BulletTrace( <start>, <end>, <hit characters>, <ignore entity> )
+	leftTrace = Bullettrace(origin_original, origin_left, false, target); // BulletTrace( <start>, <end>, <hit characters>, <ignore entity> )
+
+	new_distance_right = distance(origin_original, rightTrace["position"]) * 0.8;
+	new_distance_left = distance(origin_original, leftTrace["position"]) * 0.8;
+
+	origin[0] = origin_original + (right[0] * new_distance_right, right[1] * new_distance_right, right[2] * new_distance_right);
+	origin[1] = origin_original + (right[0] * new_distance_left * -1, right[1] * new_distance_left * -1, right[2] * new_distance_left * -1);
+
+	total_distance = distance(origin[0], origin[1]);
+
+	speed = speed * (total_distance / (distance*2));
+	time[0] = speed * (new_distance_right / (distance*2));
+	time[1] = speed * (new_distance_left / (distance*2));
+
+
+
+
+
+
+	index_1 = 0;
+	index_2 = 1;
+	rand = randomint(2); // 0 - 1
+	if (rand)
+	{
+		index_1 = 1;
+		index_2 = 0;
+	}
+
+/*
+	if (!isDefined(target.waypoint1))
+	{
+		target.waypoint1 = spawnstruct();
+		target.waypoint1.origin = origin[index_1];
+		target.waypoint1 thread maps\mp\gametypes\global\developer::showWaypoint(undefined, 1);
+	}
+	if (!isDefined(target.waypoint2))
+	{
+		target.waypoint2 = spawnstruct();
+		target.waypoint2.origin = origin[index_2];
+		target.waypoint2 thread maps\mp\gametypes\global\developer::showWaypoint(undefined, 1);
+	}
+	target.waypoint1.origin = origin[index_1];
+	target.waypoint2.origin = origin[index_2];
+*/
+/*
+	iprintln("speed: ("+speed+")");
+	iprintln("right: ("+time[0]+")");
+	iprintln("left: ("+time[1]+")");
+*/
+	firstMove = true;
+	for(;;)
+	{
+		accel = 0.1;
+		time1 = speed;
+		time2 = speed;
+		accel1 = time1*accel;
+		if (firstMove)
+		{
+			time1 = time[index_1]; // first move is faster with no accell
+			accel1 = 0;
+			firstMove = false;
+		}
+
+		target moveto(origin[index_1], time1, accel1, time1*accel); // moveto( <point>, <time>, <acceleration time>, <deceleration time> )
+
+		target waittill("movedone");
+
+		target moveto(origin[index_2], time2, time2*accel, time2*accel); // moveto( <point>, <time>, <acceleration time>, <deceleration time> )
+
+		target waittill("movedone");
+	}
+}
+
+
+
+
+
+
+toggle()
+{
+	if (level.aimTargets.size == 0)
+	{
+		self iprintln("^1This map does not support aim trainer targets!");
+		return;
+	}
+
+
+	wasDisabled = self.aimTrainerMode == 0;
+
+	for (i = 0; i < 2; i++)
+		self iprintlnbold(" ");
+
+	if (self.aimTrainerMode == 0)
+	{
+		self.aimTrainerMode = 1;
+
+		self thread player_loop();
+
+		// No avaible targets
+		if (self.aimTrainerMode == 0)
+			return;
+
+		self iprintln("Aim Trainer ^2Enabled");
+		self iprintlnbold("Aim Trainer ^2Enabled");
+	}
+
+
+	if (wasDisabled || self.aimTrainerMode == 4)
+	{
+		self.aimTrainerMode = 1;
+		self iprintlnbold("Mode 1: Static targets");
+	}
+	else if (self.aimTrainerMode == 1)
+	{
+		self.aimTrainerMode = 2;
+		self iprintlnbold("Mode 2: Moving targets");
+	}
+	else if (self.aimTrainerMode == 2)
+	{
+		self.aimTrainerMode = 3;
+		self iprintlnbold("Mode 3: Moving targets fast");
+	}
+	else if (self.aimTrainerMode == 3)
+	{
+		self.aimTrainerMode = 4;
+		self iprintlnbold("Mode 4: Reaction time");
+	}
+
+	self thread generateMeNewTargetPosition("mode");
+
+	for (i = 0; i < 2; i++)
+		self iprintlnbold(" ");
+}
+
+turnOff()
+{
+	if (isDefined(self.aimTrainerMode) && self.aimTrainerMode)
+	{
+		self notify("aim_trainer_turnedOff");
+
+		self.aimTarget1 releaseTarget();
+
+		self iprintln("Aim Trainer ^1Disabled");
+		self iprintlnbold("Aim Trainer ^1Disabled");
+
+		self.aimTrainerMode = 0;
+	}
+}
+
+
+player_loop()
+{
+	self endon("disconnect");
+	self endon("aim_trainer_turnedOff");
+
+	self.aimTarget1 = reserveTargetBy(self);
+
+	// No avaible targets
+	if (!isDefined(self.aimTarget1))
+	{
+		self iprintln("^1No avaible targets!");
+		self iprintlnbold("^1No avaible targets!");
+		self.aimTrainerMode = 0;
+		return;
+	}
+
+	self.aimTarget1.generateTime = undefined;
+	self.aimTarget1.kills = 0;
+
+	self.aimTarget1 thread rotateTowards(self);
+	self.aimTarget1 thread handleDamageForPlayer(self);
+	//self.aimTarget1 thread maps\mp\gametypes\global\developer::showWaypoint(self, 4);
+	//self.aimTarget1.trigger_damage thread maps\mp\gametypes\global\developer::showWaypoint(self, 3);
+
+
+	self.aimTrainer_outOfAmmo = false;
+	self.aimTrainer_startAngles = self.angles;
+	last_current = "none";
+	last_ammo = 0;
+	last_kills = 0;
+	last_mode = self.aimTrainerMode;
+	while(1)
+	{
+		wait level.frame;
+
+		if (!isAlive(self))
+		{
+			self.aimTrainer_outOfAmmo = false;
+			continue;
+		}
+
+		weapon1 = self getweaponslotweapon("primary");
+		weapon2 = self getweaponslotweapon("primaryb");
+
+		weapon1_clipAmmo = self getweaponslotclipammo("primary");
+		weapon2_clipAmmo = self getweaponslotclipammo("primaryb");
+
+		current = self getcurrentweapon();
+
+		// For example player is on ladder
+		if(current == "none")
+			continue;
+
+		current_ammo = -1;
+		if(current == weapon1) current_ammo = weapon1_clipAmmo;
+		if(current == weapon2) current_ammo = weapon2_clipAmmo;
+
+		//self iprintln("ammo: " + current_ammo);
+
+		// Out of ammo, wait for reloading
+		if(current_ammo == 0)
+		{
+			//self iprintln("out of ammo");
+			self.aimTrainer_outOfAmmo = true;
+		}
+
+		// Ammo restored
+		if (self.aimTrainer_outOfAmmo && current_ammo > 0)
+		{
+			wait level.fps_multiplier * 1.5;
+
+			self.aimTrainer_outOfAmmo = false;
+
+			self.aimTrainer_startAngles = self.angles;
+
+			//self iprintln("ammo restored");
+		}
+
+		// Weapon reloaded, give max ammo to slot
+		if (last_current == current && current_ammo > last_ammo && last_ammo >= 0)
+		{
+			self giveMaxAmmo(current);
+
+			self.aimTrainer_startAngles = self.angles;
+		}
+
+		if (last_current == current && current_ammo < last_ammo && current_ammo >= 0)
+		{
+			//self iprintln("fired");
+
+			// This bullet was not into target
+			if (self.aimTarget1.kills == last_kills && self.aimTrainerMode == last_mode)
+			{
+				//self iprintln("missed shot");
+
+				self thread generateMeNewTargetPosition("missed");
+			}
+
+
+		}
+
+		last_current = current;
+		last_ammo = current_ammo;
+		last_kills = self.aimTarget1.kills;
+		last_mode = self.aimTrainerMode;
+	}
+}
+
+generateMeNewTargetPosition(reason)
+{
+	self endon("disconnect");
+	self endon("aim_trainer_turnedOff");
+
+	if (!isDefined(self.aimTarget1))
+		return;
+
+	// Lock thread
+	self.aimTarget1 notify("aim_trainer_target_updated");
+	self.aimTarget1 endon("aim_trainer_target_updated");
+
+	// Mode
+	weapons["m1carbine_mp"] = 		2;
+	weapons["m1garand_mp"] = 		2;
+	weapons["thompson_mp"] = 		2;
+	weapons["bar_mp"] = 			2;
+	weapons["springfield_mp"] = 		  1;
+	weapons["greasegun_mp"] = 		2;
+	weapons["shotgun_mp"] = 		  1;
+	weapons["enfield_mp"] = 		  1;
+	weapons["sten_mp"] = 			2;
+	weapons["bren_mp"] = 			2;
+	weapons["enfield_scope_mp"] = 		  1;
+	weapons["mosin_nagant_mp"] = 		  1;
+	weapons["SVT40_mp"] = 			2;
+	weapons["PPS42_mp"] = 			2;
+	weapons["ppsh_mp"] = 			2;
+	weapons["mosin_nagant_sniper_mp"] = 	  1;
+	weapons["kar98k_mp"] = 			  1;
+	weapons["g43_mp"] = 			2;
+	weapons["mp40_mp"] = 			2;
+	weapons["mp44_mp"] = 			2;
+	weapons["kar98k_sniper_mp"] = 		  1;
+	weapons["colt_mp"] = 			2;
+	weapons["luger_mp"] = 			2;
+	weapons["tt30_mp"] = 			2;
+	weapons["webley_mp"] = 			2;
+	weapons["mg_mp"] = 			2;
+
+	// "", "missed", "kill"
+	if (!isDefined(reason))
+		reason = "";
+
+	playSpawnSound = false;
+
+
+	// Mode changed or initialized
+	if (reason == "mode")
+	{
+		self.aimTarget1 hide();
+		self.aimTarget1.origin = (-99999, -99999, -99999);
+
+		wait level.fps_multiplier * 1.5;
+
+		self.aimTrainer_startAngles = self.angles;
+
+		playSpawnSound = true;
+	}
+
+	if (reason == "missed")
+	{
+		self.aimTarget1 hide();
+		self.aimTarget1.origin = (-99999, -99999, -99999);
+
+		// Mode 4: Reaction time"
+		if (self.aimTrainerMode == 4)
+		{
+			self iprintlnbold("^1Too soon!");
+		}
+
+		wait level.fps_multiplier * 0.1;
+
+		self playlocalsound("aim_trainer_missed_shot");
+
+		wait level.fps_multiplier * 0.9;
+
+		self.aimTrainer_startAngles = self.angles;
+
+		playSpawnSound = true;
+	}
+
+	if (reason == "kill")
+	{
+		react_time = -1;
+		if (isDefined(self.aimTarget1.generateTime))
+		{
+			react_time = (gettime() - self.aimTarget1.generateTime);
+			// Because it will be always increment of sv_fps and the ping, add some number to make it dynamic
+			react_time += randomint(level.sv_fps);
+			// Remove 30 ms ping
+			if (react_time > 50) react_time -= 30;
+
+			// Mode 4: Reaction time"
+			if (self.aimTrainerMode == 4)
+			{
+				self iprintlnbold("Reaction time: " + react_time + "ms");
+			}
+
+
+			if (react_time > 5000)
+				self.aimTrainer_startAngles = self.angles;
+
+		}
+
+		playfx(level._effect["aimTargetExplosion"], self.aimTarget1.origin);
+		self playlocalsound("aim_trainer_hit");
+
+		self.aimTarget1 hide();
+		self.aimTarget1.origin = (-99999, -99999, -99999);
+		self.aimTarget1.kills++;
+	}
+
+	wait level.frame;
+
+	while(self.aimTrainer_outOfAmmo)
+	{
+		wait level.frame;
+		playSpawnSound = true;
+	}
+
+
+	weapon = self getcurrentweapon(); // can be none
+	if (self.usingMG)
+		weapon = "mg_mp";
+
+	mode = 1;
+	if (isDefined(weapons[weapon]))
+		mode = weapons[weapon];
+
+	// Single shot
+	if (mode == 1)
+	{
+		wait level.fps_multiplier * 2;
+
+		playSpawnSound = true;
+	}
+
+	// Automatic
+	if (mode == 2)
+	{
+
+	}
+
+	//self iprintln("self.aimTrainerMode: " + self.aimTrainerMode);
+
+	if (self.aimTrainerMode == 1)
+	{
+		// Mode 1: Static targets
+		self.aimTarget1.origin = self getTargetPos(true);
+	}
+	else if (self.aimTrainerMode == 2)
+	{
+		// Mode 2: Moving targets
+		self.aimTarget1.origin = self getTargetPos(true);
+		self.aimTarget1 thread moving(5);
+	}
+	else if (self.aimTrainerMode == 3)
+	{
+		// Mode 3: Moving targets fast
+		self.aimTarget1.origin = self getTargetPos(true);
+		self.aimTarget1 thread moving(2.5);
+	}
+	else if (self.aimTrainerMode == 4)
+	{
+		// Mode 4: Reaction time"
+		wait level.fps_multiplier * 1;
+		wait level.fps_multiplier * (randomint(30) / 10);  // 0.0 - 2.9
+		self.aimTarget1.origin = self getTargetPos(false);
+		playSpawnSound = true;
+	}
+
+	//self.aimTarget1.trigger_damage unlink();
+	self.aimTarget1.trigger_damage.origin = self.aimTarget1.origin;
+	//self.aimTarget1.trigger_damage linkto(self.aimTarget1);
+
+	self.aimTarget1 show();
+	//self.aimTarget1 thread setKillTimeout(5, self);
+	self.aimTarget1.generateTime = gettime();
+
+	if (playSpawnSound)
+		self playlocalsound("aim_trainer_spawn");
+}
diff --git a/source/maps/mp/gametypes/_archive.gsc b/source/maps/mp/gametypes/_archive.gsc
index 4cced2c..2b7c9f7 100644
--- a/source/maps/mp/gametypes/_archive.gsc
+++ b/source/maps/mp/gametypes/_archive.gsc
@@ -37,7 +37,7 @@ update()
 {
 	if(level.scr_killcam ||
 		level.antilag ||
-		level.autoSpectating_do)
+		level.spectatingSystem)
 		setarchive(true);
 	else
 		setarchive(false);
diff --git a/source/maps/mp/gametypes/_bash.gsc b/source/maps/mp/gametypes/_bash.gsc
index 59dc88d..6cff335 100644
--- a/source/maps/mp/gametypes/_bash.gsc
+++ b/source/maps/mp/gametypes/_bash.gsc
@@ -52,14 +52,16 @@ onCvarChanged(cvar, value, isRegisterTime)
 
 onConnected()
 {
-    // Set actual bash mode status on player connect + when round restart in SD
-    self setClientCvar2("ui_allow_bash", self Validate_bash(false));
+	// Set actual bash mode status on player connect + when round restart in SD
+	if (isDefined(self.pers["firstTeamSelected"])) // save cvars sent to player on first connect
+		self setClientCvar2("ui_allow_bash", self Validate_bash(false));
 }
 
 onSpawned()
 {
 	// Set actual bash mode status on player connect + when round restart in SD
-	self setClientCvar2("ui_allow_bash", self Validate_bash(false));
+	if (isDefined(self.pers["firstTeamSelected"])) // save cvars sent to player on first connect
+		self setClientCvar2("ui_allow_bash", self Validate_bash(false));
 
 	if (level.in_bash)
 	{
diff --git a/source/maps/mp/gametypes/_blackout.gsc b/source/maps/mp/gametypes/_blackout.gsc
index 15ec901..b6b1105 100644
--- a/source/maps/mp/gametypes/_blackout.gsc
+++ b/source/maps/mp/gametypes/_blackout.gsc
@@ -12,7 +12,7 @@ init()
 		precacheString2("STRING_BLACKOUT_PROTECTION", &"Blackout Protection");
 		precacheString2("STRING_BLACKOUT_INFO", &"You see this map background because match is in progress.");
 
-		precacheStatusIcon("icon_blackout");
+		//precacheStatusIcon("icon_blackout"); // removed due to max 8 precached status icons for streamers icon
 	}
 
 	addEventListener("onConnected",     ::onConnected);
@@ -66,7 +66,7 @@ spawnBlackout()
     [[level.spawnSpectator]]((999999, 999999, -999999), (90, 0, 0));
 
 	// Special icon for player in "none" team
-	self.statusicon = "icon_blackout";
+	//self.statusicon = "icon_blackout";
 
 	// Shows map background
     self setClientCvar2("ui_blackout", "1");
@@ -121,8 +121,8 @@ showWarningMessage()
 
 removeBlackout()
 {
-	if (self.statusicon == "icon_blackout")
-		self.statusicon = "";
+	//if (self.statusicon == "icon_blackout")
+		//self.statusicon = "";
 
     self setClientCvar2("ui_blackout", "0");
 
diff --git a/source/maps/mp/gametypes/_bots.gsc b/source/maps/mp/gametypes/_bots.gsc
index 5c06141..4fd315c 100644
--- a/source/maps/mp/gametypes/_bots.gsc
+++ b/source/maps/mp/gametypes/_bots.gsc
@@ -15,6 +15,7 @@ Init()
 	registerCvarEx("I", "scr_bots_removeAll", "BOOL", 0);		// remove all bots from server
 	registerCvarEx("I", "scr_bots_fillEnabled", "BOOL", 0);		// enable / disable fill the server with bots automaticly up to limit
 	registerCvarEx("I", "scr_bots_fillMaxBots", "INT", 6, 0, 64); 	// maximum number of bots
+	registerCvarEx("I", "scr_bots_freeze", "BOOL", 1); 	// freeze bots movement
 
 	// Watch cvar change
 	level thread bots_autoFill();
@@ -58,6 +59,10 @@ onCvarChanged(cvar, value, isRegisterTime)
 
 		case "scr_bots_fillenabled": 		level.bots_fillEnabled = value;		return true;
 		case "scr_bots_fillmaxbots": 		level.bots_fillMaxBots = value;		return true;
+		case "scr_bots_freeze": 		level.bots_freeze = value;		return true;
+
+
+
 	}
 	return false;
 }
@@ -158,6 +163,13 @@ removeBots(number)
 		if (isDefined(players[i].pers["isTestClient"]))
 		{
 			userid = players[i] getEntityNumber();
+
+			// For bots only
+			if (isDefined(players[i].botLockPosition))
+			{
+				players[i].botLockPosition delete();
+			}
+
 			kick(userid);
 
 			kickedBots++;
@@ -170,7 +182,6 @@ removeBots(number)
 }
 
 
-
 bots_autoFill()
 {
 	// Wait untill all players/bots are connected
@@ -297,6 +308,8 @@ bot_think()
 
 	wait level.fps_multiplier * 0.1;
 
+	self thread bot_think_freeze();
+
 	// Wait while client is connected
 	while(!isdefined(self.pers["team"]))
 		wait level.fps_multiplier * .2;
@@ -321,7 +334,38 @@ bot_think()
 			wait level.fps_multiplier * 0.2;
 		}
 
+
+
 		wait level.fps_multiplier * 3;
 	}
 
 }
+
+bot_think_freeze()
+{
+	self endon("disconnect");
+
+	for(;;)
+	{
+		if (!isDefined(self.botLockPosition))
+		{
+			self.botLockPosition = spawn("script_model", (0,0,0));
+		}
+
+		wait level.fps_multiplier * .25;
+
+		for (;;)
+		{
+			self enableWeapon();
+			self unlink();
+			while(!isAlive(self) || !level.bots_freeze)	wait level.fps_multiplier * 1;
+
+			self linkto(self.botLockPosition);
+			self disableWeapon();
+
+			while(isAlive(self) && level.bots_freeze)	wait level.fps_multiplier * 1;
+		}
+	}
+
+
+}
diff --git a/source/maps/mp/gametypes/_callbacksetup.gsc b/source/maps/mp/gametypes/_callbacksetup.gsc
index 6ef64a3..5ed4b97 100644
--- a/source/maps/mp/gametypes/_callbacksetup.gsc
+++ b/source/maps/mp/gametypes/_callbacksetup.gsc
@@ -159,6 +159,10 @@ CodeCallback_PlayerConnect()
 	// Wait here until player is fully connected
 	self waittill("begin");
 
+	/#
+	println("##### " + gettime() + " " + level.frame_num + " ##### Connected: " + self.name);
+	#/
+
 	self thread maps\mp\gametypes\global\events::notifyConnected();
 
 	// If pam is not installed correctly, spawn outside
@@ -186,6 +190,10 @@ CodeCallback_PlayerDisconnect()
 {
 	self notify("disconnect");
 
+	/#
+	println("##### " + gettime() + " " + level.frame_num + " ##### Disconnected: " + self.name);
+	#/
+
 	self thread maps\mp\gametypes\global\events::notifyDisconnect();
 }
 
@@ -221,6 +229,9 @@ sHitLoc
 	right_leg_lower
 	right_foot
 
+client:client_2  health:100 damage:90 hitLoc:torso_lower iDFlags:32 sMeansOfDeath: MOD_RIFLE_BULLET sWeapon: m1garand_mp vPoint: (-61.1327, 1090.97, 25.2369) vDir: (0.651344, -0.728131, -0.213485) timeOffset: 0
+client:client_2  health:55 damage:45 hitLoc:torso_lower iDFlags:0 sMeansOfDeath: MOD_PISTOL_BULLET sWeapon: webley_mp vPoint: (-189.78, 1102.76, 39.3595) vDir: (0.140321, -0.958474, -0.248269) timeOffset: 0
+
 ================*/
 CodeCallback_PlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, timeOffset)
 {
@@ -230,26 +241,27 @@ CodeCallback_PlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath
 	resettimeout();
 
 	// Do debug print if it's enabled
-	if(level.debugDamage)
+	if(level.g_debugDamage)
 	{
-		dist = -1; if (isDefined(eAttacker) && isPlayer(eAttacker)) dist = int(distance(self getOrigin(), eAttacker getOrigin()));
-		strAttacker = "undefined"; if (isDefined(eAttacker)) if (isPlayer(eAttacker)) strAttacker = "#" + (eAttacker getEntityNumber()) + " " + eAttacker.name; else strAttacker = "-entity-";
-		sPoint = "undefined";	if (isDefined(vPoint)) sPoint = vPoint;
-		println("#Damage " + getTime() + " " + strAttacker + " -> #" + self getEntityNumber() + " " + self.name + " health:" + self.health + " damage:" + iDamage + " hitLoc:" + sHitLoc + " iDFlags:" + iDFlags +
-		" sMeansOfDeath:" + sMeansOfDeath + " sWeapon:" + sWeapon + " vPoint:" + sPoint + " distance:" + dist);
-
-		//client:client_2  health:100 damage:90 hitLoc:torso_lower iDFlags:32 sMeansOfDeath: MOD_RIFLE_BULLET sWeapon: m1garand_mp vPoint: (-61.1327, 1090.97, 25.2369) vDir: (0.651344, -0.728131, -0.213485) timeOffset: 0
-		//client:client_2  health:55 damage:45 hitLoc:torso_lower iDFlags:0 sMeansOfDeath: MOD_PISTOL_BULLET sWeapon: webley_mp vPoint: (-189.78, 1102.76, 39.3595) vDir: (0.140321, -0.958474, -0.248269) timeOffset: 0
-
 		if (isDefined(eAttacker) && isPlayer(eAttacker))
 		{
+			dist = int(distance(self getOrigin(), eAttacker getOrigin()));
 			eAttacker iprintln("You inflicted " + iDamage + " damage to " + self.name + " (" + sHitLoc + ", "+ sMeansOfDeath +", distance "+dist+")");
 			self iprintln("You recieved " + iDamage + " damage from " + eAttacker.name + " (" + sHitLoc + ", "+ sMeansOfDeath +", distance "+dist+")");
 		}
 		else
-			self iprintln("You recieved " + iDamage + " damage (" + sHitLoc + ", "+ sMeansOfDeath +", distance "+dist+")");
+			self iprintln("You recieved " + iDamage + " damage (" + sHitLoc + ", "+ sMeansOfDeath +")");
 	}
 
+	/#
+	dist = -1; if (isDefined(eAttacker) && isPlayer(eAttacker)) dist = int(distance(self getOrigin(), eAttacker getOrigin()));
+	strAttacker = "undefined"; if (isDefined(eAttacker)) if (isPlayer(eAttacker)) strAttacker = "#" + (eAttacker getEntityNumber()) + " " + eAttacker.name; else strAttacker = "-entity-";
+	sPoint = "undefined";	if (isDefined(vPoint)) sPoint = vPoint;
+
+	println("##### " + gettime() + " " + level.frame_num + " ##### PlayerDamage: " + strAttacker + " -> #" + self getEntityNumber() + " " + self.name + " health:" + self.health + " damage:" + iDamage + " hitLoc:" + sHitLoc + " iDFlags:" + iDFlags +
+	" sMeansOfDeath:" + sMeansOfDeath + " sWeapon:" + sWeapon + " vPoint:" + sPoint + " distance:" + dist);
+	#/
+
 
 	// Save antilag time offset
 	if (isDefined(eAttacker) && isPlayer(eAttacker))
@@ -273,6 +285,11 @@ CodeCallback_PlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath
 	self_num = self getEntityNumber();
 	if (isDefined(eAttacker) && isPlayer(eAttacker))
 	{
+		// Id of shot in this frame for attacker (to count double kills for example)
+		if (!isDefined(eAttacker.hitId))
+			eAttacker.hitId = 0;			// inited to 0, but will be incremented. 1 then means first bullet
+		eAttacker.hitId++;
+
 		// Create variable to hold hit data
 		if (!isDefined(eAttacker.hitData))
 			eAttacker.hitData = [];
@@ -280,7 +297,7 @@ CodeCallback_PlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath
 		if (!isDefined(eAttacker.hitData[self_num]))
 		{
 			eAttacker.hitData[self_num] = spawnstruct();
-			eAttacker.hitData[self_num].id = 0;			// inited to 0, but will be incremented. 1 then means first bullet
+			eAttacker.hitData[self_num].id = 0;			// inited to 0, but will be incremented. 1 then means first bullet to specific player
 			eAttacker.hitData[self_num].adjustedBy = "";		// string telling if hit was adjusted by FIXes
 			eAttacker.hitData[self_num].damage = 0;
 			eAttacker.hitData[self_num].damage_comulated = 0;
@@ -288,12 +305,14 @@ CodeCallback_PlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath
 		eAttacker.hitData[self_num].id++;
 
 		self thread hitDataAutoRestart(eAttacker, self_num);
+		eAttacker thread hitIdAutoRestart();
 	}
 
 
-	debug = 0; // 1 = print to console
 
 
+	debug = 0; // 1 = print to console
+
 	// Hitbox left and right hand fix
 	if (level.scr_hitbox_hand_fix &&
 		isDefined(sWeapon) && isDefined(sHitLoc) && isDefined(eAttacker) && isPlayer(eAttacker) && eAttacker != self)
@@ -304,9 +323,10 @@ CodeCallback_PlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath
 		damageOk = (iDamage < 100);
 		bodyOrHeadVisible = false;
 		distanceOK = false;
+		firstBullet = eAttacker.hitId == 1; // this will ignore double shots
 		applyFix = false;
 
-		if (correctWeapon && damageOk)
+		if (correctWeapon && damageOk && firstBullet)
 		{
 			distance = distance(self.origin, eAttacker.origin);
 			distanceOK = (distance > 200);
@@ -410,6 +430,7 @@ CodeCallback_PlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath
 				{
 					if (!correctWeapon) 		eAttacker iprintln("^3Hand hitbox fix - inside, but this weapon is ignored");
 					else if (!damageOk) 		eAttacker iprintln("^3Hand hitbox fix - inside, but this is already determined as KILL");
+					else if (!firstBullet) 		eAttacker iprintln("^3Hand hitbox fix - inside, but this is not first bullet (double shot)");
 					else if (!distanceOK) 		eAttacker iprintln("^3Hand hitbox fix - inside, but your too close to enemy");
 					else if (!bodyOrHeadVisible) 	eAttacker iprintln("^3Hand hitbox fix - inside, but body and head is not visible");
 					else				eAttacker iprintln("^1Hand hitbox fix - hit is inside the box, changing to KILL!");
@@ -460,6 +481,19 @@ CodeCallback_PlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath
 				applyFix = true;
 		}
 
+		if (level.debug_torsohitbox)
+		{
+			if (!isDefined(self.hit_pelvis))
+			{
+				self.hit_pelvis = spawn("script_origin", (0,0,0));
+				self.hit_pelvis thread maps\mp\gametypes\global\developer::showWaypoint();
+				self.hit_point = spawn("script_origin", (0,0,0));
+				self.hit_point thread maps\mp\gametypes\global\developer::showWaypoint();
+			}
+			self.hit_pelvis.origin = self.pelvisTag getOrigin();
+			self.hit_point.origin = vPoint;
+		}
+
 		if (applyFix)
 		{
 			if (level.debug_torsohitbox)
@@ -609,7 +643,7 @@ CodeCallback_PlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath
 
 
 	// Save affected damage value
-	if (isDefined(eAttacker) && isPlayer(eAttacker))
+	if (isDefined(eAttacker) && isPlayer(eAttacker) && isDefined(eAttacker.hitData) && isDefined(eAttacker.hitData[self_num]) && isDefined(eAttacker.hitData[self_num].damage_comulated))
 		eAttacker.hitData[self_num].damage_comulated += iDamage;
 
 
@@ -629,7 +663,7 @@ CodeCallback_PlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath
 	}
 }
 
-hitDataAutoRestart(eAttacker, id)
+hitDataAutoRestart(eAttacker, self_num)
 {
 	//self endon("disconnect");
 	eAttacker endon("disconnect");
@@ -642,9 +676,10 @@ hitDataAutoRestart(eAttacker, id)
 	waittillframeend;
 	waittillframeend;
 	waittillframeend;
-	eAttacker.hitData[id].id = 0;
-	eAttacker.hitData[id].damage = 0;
-	eAttacker.hitData[id].adjustedBy = "";
+
+	eAttacker.hitData[self_num].id = 0;
+	eAttacker.hitData[self_num].damage = 0;
+	eAttacker.hitData[self_num].adjustedBy = "";
 
 	// Wait 5 sec if player is still alive
 	for(i = 0; i < 5; i++)
@@ -656,9 +691,17 @@ hitDataAutoRestart(eAttacker, id)
 	}
 
 	// Remove the rest of the data
-	eAttacker.hitData[id] = undefined;
+	eAttacker.hitData[self_num] = undefined;
+}
+
+hitIdAutoRestart()
+{
+	waittillframeend;
+	self.hitId = undefined;
 }
 
+
+
 damageScale(dist, distStart, distEnd, hpStart, hpEnd)
 {
 	return int(hpStart - ((dist - distStart) / (distEnd - distStart)) * (hpStart - hpEnd));
@@ -696,13 +739,11 @@ CodeCallback_PlayerKilled(eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon
 	// Resets the infinite loop check timer, to prevent an incorrect infinite loop error when a lot of script must be run
 	resettimeout();
 
-	// Do debug print if it's enabled
-	if(level.debugDamage)
-	{
-		strAttacker = "undefined"; if (isDefined(eAttacker)) if (isPlayer(eAttacker)) strAttacker = "#" + (eAttacker getEntityNumber()) + " " + eAttacker.name; else strAttacker = "-entity-";
-		println("#Kill " + getTime() + " " + strAttacker + " -> #" + self getEntityNumber() + " " + self.name + " health:" + self.health + " damage:" + iDamage + " hitLoc:" + sHitLoc +
-		" sMeansOfDeath:" + sMeansOfDeath + " sWeapon:" + sWeapon + " sessionstate:" + self.sessionstate + " timeOffset:" + timeOffset);
-	}
+	/#
+	strAttacker = "undefined"; if (isDefined(eAttacker)) if (isPlayer(eAttacker)) strAttacker = "#" + (eAttacker getEntityNumber()) + " " + eAttacker.name; else strAttacker = "-entity-";
+	println("##### " + gettime() + " " + level.frame_num + " ##### PlayerKilled: " + strAttacker + " -> #" + self getEntityNumber() + " " + self.name + " health:" + self.health + " damage:" + iDamage + " hitLoc:" + sHitLoc +
+	" sMeansOfDeath:" + sMeansOfDeath + " sWeapon:" + sWeapon + " sessionstate:" + self.sessionstate + " timeOffset:" + timeOffset);
+	#/
 
 	// Player in spectator cannot be killed
 	if(self.sessionteam == "spectator")
@@ -746,6 +787,13 @@ CodeCallback_PlayerKilled(eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon
 
 	// Call gametype specific event that is called as last
 	[[level.onAfterPlayerKilled]](eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, timeOffset, deathAnimDuration);
+
+
+	// Warning about high ping
+	if (isPlayer(eAttacker) && eAttacker != self && timeOffset > 100)
+	{
+		self iprintln("^3You were killed by player with high ping " + timeOffset + "ms!"); // TODO
+	}
 }
 
 
diff --git a/source/maps/mp/gametypes/_cvar_forces.gsc b/source/maps/mp/gametypes/_cvar_forces.gsc
index a7b79be..0d4767c 100644
--- a/source/maps/mp/gametypes/_cvar_forces.gsc
+++ b/source/maps/mp/gametypes/_cvar_forces.gsc
@@ -25,92 +25,100 @@ onConnected()
 
 competitiveQuality()
 {
-    self endon("disconnect");
+	self endon("disconnect");
 
-    wait level.fps_multiplier * (randomIntRange(10, 30) / 10); // wait 1-3 sec (to avoid sendind commands to all players at once)
+	// Wait till player join team to save sent cvars to client
+	while (!isDefined(self.pers["firstTeamSelected"]))
+		wait level.frame;
 
-    // More realistic bullet-trace light
-    self setClientCvar2("cg_tracerChance", "1");
-    self setClientCvar2("cg_tracerWidth", "1");
-    self setClientCvar2("cg_tracerLength", "1000");
-    self setClientCvar2("cg_tracerSpeed", "20000");
+	wait level.fps_multiplier * 0.1;
 
-    wait level.fps_multiplier * 0.1;
+	// Wait more if player joined spectator (usefull especially for streamers - lot of cvars is beeing sent)
+	if (self.sessionteam == "spectator")
+		wait level.fps_multiplier * 5;
 
-    // Show icons in scipe while zoomed
-    self setClientCvar2("cg_hudDamageIconInScope", "1");
-    self setClientCvar2("cg_hudGrenadeIconInScope", "1");
+	// More realistic bullet-trace light
+	self setClientCvar2("cg_tracerChance", "1");
+	self setClientCvar2("cg_tracerWidth", "1");
+	self setClientCvar2("cg_tracerLength", "1000");
+	self setClientCvar2("cg_tracerSpeed", "20000");
 
-    // disable sun
-    self setClientCvar2("r_drawSun", 0);
+	// Show icons in scipe while zoomed
+	self setClientCvar2("cg_hudDamageIconInScope", "1");
+	self setClientCvar2("cg_hudGrenadeIconInScope", "1");
+
+	// disable sun
+	self setClientCvar2("r_drawSun", 0);
 }
 
 
 setForcedCvarsByPB()
 {
-    self endon("disconnect");
-
-    wait level.fps_multiplier * (randomIntRange(10, 30) / 10); // wait 1-3 sec (to avoid sendind commands to all players at once)
-
-    self setClientCvar2("cg_errordecay", "100");
-    self setClientCvar2("cg_hintFadeTime", "100");
+	self endon("disconnect");
 
-    self setClientCvar2("cg_hudCompassMaxRange", "1500");
-    self setClientCvar2("cg_hudCompassMinRadius", "0");
-    self setClientCvar2("cg_hudCompassMinRange", "0");
-    self setClientCvar2("cg_hudCompassSpringyPointers", "0");
-    self setClientCvar2("cg_hudCompassSoundPingFadeTime", "2");
+	// Wait till player join team to save sent cvars to client
+	while (!isDefined(self.pers["firstTeamSelected"]))
+		wait level.frame;
 
+	wait level.fps_multiplier * 0.2;
 
-	wait level.frame;
+	// Wait more if player joined spectator (usefull especially for streamers - lot of cvars is beeing sent)
+	if (self.sessionteam == "spectator")
+		wait level.fps_multiplier * 5;
 
-    self setClientCvar2("cg_hudDamageIconHeight", "64");
-    self setClientCvar2("cg_hudDamageIconOffset", "128");
-    self setClientCvar2("cg_hudDamageIconTime", "2000");
-    self setClientCvar2("cg_hudDamageIconWidth", "128");
+	self setClientCvar2("snaps", 30);
+	self setClientCvar2("sc_enable", "0");
+	self setClientCvar2("fx_sort", "1");
+	self setClientCvar2("rate", "25000");
+	self setClientCvar2("cl_maxpackets", "100");
 
-    wait level.frame;
+	wait level.fps_multiplier * 0.2;
 
-    self setClientCvar2("cg_hudGrenadeIconHeight", "25");
-    self setClientCvar2("cg_hudGrenadeIconOffset", "50");
-    self setClientCvar2("cg_hudGrenadeIconWidth", "25");
-    self setClientCvar2("cg_hudGrenadePointerHeight", "12");
-	wait level.frame;
-    self setClientCvar2("cg_hudGrenadePointerPivot", "12 27");
-    self setClientCvar2("cg_hudGrenadePointerWidth", "25");
+	self setClientCvar2("cg_viewsize", "100");
+	self setClientCvar2("cl_avidemo", "0");
+	self setClientCvar2("cl_forceavidemo", "0");
+	self setClientCvar2("cl_freelook", "1");
+	self setClientCvar2("cl_pitchspeed", "140");
+	self setClientCvar2("cl_yawspeed", "140");
 
-    self setClientCvar2("cg_hudObjectiveMaxRange", "2048");
-    self setClientCvar2("cg_hudObjectiveMinAlpha", "1");
-    self setClientCvar2("cg_hudObjectiveMinHeight", "-70");
+	wait level.fps_multiplier * 0.2;
 
-    wait level.frame;
+	self setClientCvar2("fixedtime", "0");
+	self setClientCvar2("friction", "5.5");
+	self setClientCvar2("mss_q3fs", "1");
+	self setClientCvar2("cg_errordecay", "100");
+	self setClientCvar2("cg_hintFadeTime", "100");
 
-    self setClientCvar2("cg_viewsize", "100");
-    self setClientCvar2("cl_avidemo", "0");
-    self setClientCvar2("cl_forceavidemo", "0");
-    self setClientCvar2("cl_freelook", "1");
-	wait level.frame;
-    self setClientCvar2("cl_maxpackets", "100");
-    //self setClientCvar2("cl_packetdup", "3");
-    self setClientCvar2("cl_pitchspeed", "140");
-    self setClientCvar2("cl_yawspeed", "140");
+	wait level.fps_multiplier * 0.2;
 
+	self setClientCvar2("cg_hudCompassMaxRange", "1500");
+	self setClientCvar2("cg_hudCompassMinRadius", "0");
+	self setClientCvar2("cg_hudCompassMinRange", "0");
+	self setClientCvar2("cg_hudCompassSpringyPointers", "0");
+	self setClientCvar2("cg_hudCompassSoundPingFadeTime", "2");
 
+	wait level.fps_multiplier * 0.2;
 
-    wait level.frame;
+	self setClientCvar2("cg_hudDamageIconHeight", "64");
+	self setClientCvar2("cg_hudDamageIconOffset", "128");
+	self setClientCvar2("cg_hudDamageIconTime", "2000");
+	self setClientCvar2("cg_hudDamageIconWidth", "128");
 
-    self setClientCvar2("fixedtime", "0");
-    self setClientCvar2("friction", "5.5");
-    self setClientCvar2("fx_sort", "1");
-    self setClientCvar2("mss_q3fs", "1");
+	wait level.fps_multiplier * 0.2;
 
-	wait level.frame;
+	self setClientCvar2("cg_hudGrenadeIconHeight", "25");
+	self setClientCvar2("cg_hudGrenadeIconOffset", "50");
+	self setClientCvar2("cg_hudGrenadeIconWidth", "25");
+	self setClientCvar2("cg_hudGrenadePointerHeight", "12");
 
-    self setClientCvar2("rate", "25000");
-    self setClientCvar2("sc_enable", "0");
-    self setClientCvar2("snaps", 30);
+	wait level.fps_multiplier * 0.2;
 
+	self setClientCvar2("cg_hudGrenadePointerPivot", "12 27");
+	self setClientCvar2("cg_hudGrenadePointerWidth", "25");
+	self setClientCvar2("cg_hudObjectiveMaxRange", "2048");
+	self setClientCvar2("cg_hudObjectiveMinAlpha", "1");
+	self setClientCvar2("cg_hudObjectiveMinHeight", "-70");
 
-    self.pers["pbForcedCvarsLoaded"] = true;
+	self.pers["pbForcedCvarsLoaded"] = true;
 
 }
diff --git a/source/maps/mp/gametypes/_end_of_map.gsc b/source/maps/mp/gametypes/_end_of_map.gsc
index 50fd096..15ffb65 100644
--- a/source/maps/mp/gametypes/_end_of_map.gsc
+++ b/source/maps/mp/gametypes/_end_of_map.gsc
@@ -24,6 +24,9 @@ Do_Map_End()
 
 	wait level.fps_multiplier * 2;
 
+	// Wait for spectators in killcam
+	level maps\mp\gametypes\_spectating_system::waitForSpectatorsInKillcam();
+
 	maps\mp\gametypes\_mapvote::Initialize();
 
 
diff --git a/source/maps/mp/gametypes/_halftime.gsc b/source/maps/mp/gametypes/_halftime.gsc
index 15de0bb..6fb03fb 100644
--- a/source/maps/mp/gametypes/_halftime.gsc
+++ b/source/maps/mp/gametypes/_halftime.gsc
@@ -21,9 +21,16 @@ Do_Half_Time()
 	// Cancel timeout if called
 	level maps\mp\gametypes\_timeout::Cancel();
 
+	// Switch score progress For spectators
+	level maps\mp\gametypes\_spectating_system_hud::ScoreProgress_AddHalftime();
+
 
 	wait level.fps_multiplier * 4;
 
+
+	// Wait for spectators in killcam
+	level maps\mp\gametypes\_spectating_system::waitForSpectatorsInKillcam();
+
 	// Activate half-time
 	game["is_halftime"] = true;
 	logPrint("HalfTime;\n");
@@ -53,14 +60,6 @@ Do_Half_Time()
 		game["match_team2_side"] = match_team1_side;
 	}
 
-	// Switch score progress For spectators
-	if (level.gametype == "sd")
-	{
-		allies_score_history = game["allies_score_history"];
-		game["allies_score_history"] = game["axis_score_history"] + "^7|";
-		game["axis_score_history"] = allies_score_history + "^7|";
-	}
-
 
 	axissavedmodel = undefined;
 	alliedsavedmodel = undefined;
diff --git a/source/maps/mp/gametypes/_hud_teamscore.gsc b/source/maps/mp/gametypes/_hud_teamscore.gsc
index 562cc28..266b8c5 100644
--- a/source/maps/mp/gametypes/_hud_teamscore.gsc
+++ b/source/maps/mp/gametypes/_hud_teamscore.gsc
@@ -249,7 +249,7 @@ fadeOutPlayerHUD(animation)
 	if(isEnabled())
 		return;
 
-	if (self.pers["team"] == "spectator")
+	if (self.pers["team"] == "spectator" || self.pers["team"] == "streamer")
 		return;
 
 	// Score is hided yet
diff --git a/source/maps/mp/gametypes/_language.gsc b/source/maps/mp/gametypes/_language.gsc
deleted file mode 100644
index f5c22e7..0000000
--- a/source/maps/mp/gametypes/_language.gsc
+++ /dev/null
@@ -1,82 +0,0 @@
-#include maps\mp\gametypes\global\_global;
-
-init()
-{
-	addEventListener("onConnected",         ::onConnected);
-}
-
-onConnected()
-{
-	if (!isDefined(self.pers["language_orig"]))
-		self.pers["language_orig"] = -1;
-	if (!isDefined(self.pers["language_setting"]))
-		self.pers["language_setting"] = -1;
-	// English by default
-	if (!isDefined(self.pers["language"]))
-		self.pers["language"] = 0;
-}
-
-/*
-	// Localization
-	execOnDvarStringValue ui_language 0 "openscriptmenu -1 key_0"; // English
-	execOnDvarStringValue ui_language 1 "openscriptmenu -1 key_1"; // French
-	execOnDvarStringValue ui_language 2 "openscriptmenu -1 key_2"; // German
-	execOnDvarStringValue ui_language 6 "openscriptmenu -1 key_6"; // Russian
-	execOnDvarStringValue ui_language 7 "openscriptmenu -1 key_7"; // Polish
-	execOnDvarStringValue ui_language 14 "openscriptmenu -1 key_14"; // Czech
-	execOnDvarStringValue ui_language 15 "openscriptmenu -1 key_15"; // Czech
-*/
-
-// Called from OnConnect menu - value of original loc_language cvar
-// If known languages are not recognized, -1 is as default
-saveOriginalLanguage(lang)
-{
-	if (lang == "0")		self.pers["language_orig"] = 0;
-	else if (lang == "1")		self.pers["language_orig"] = 1;
-	else if (lang == "2")		self.pers["language_orig"] = 2;
-	else if (lang == "6")		self.pers["language_orig"] = 6;
-	else if (lang == "7")		self.pers["language_orig"] = 7;
-	else if (lang == "14")		self.pers["language_orig"] = 14;
-	else if (lang == "15")		self.pers["language_orig"] = 15;
-	else				self.pers["language_orig"] = -1;
-
-	// Parse language
-	self iprintln("Original language: " + self.pers["language_orig"]);
-}
-
-// Called from quick settings menu
-toggle()
-{
-	if (self.pers["language_setting"] == -1)	select(0);
-	else if (self.pers["language_setting"] == 0)	select(1);
-	else if (self.pers["language_setting"] == 1)	select(2);
-	else if (self.pers["language_setting"] == 2)	select(6);
-	else if (self.pers["language_setting"] == 6)	select(7);
-	else if (self.pers["language_setting"] == 7)	select(14);
-	else if (self.pers["language_setting"] == 14)	select(15);
-	else if (self.pers["language_setting"] == 15)	select(-1);
-	else						select(-1);
-}
-
-// Called from quick settings menu when saved players settings are loaded
-select(lang)
-{
-	// If language is "Automatic", use original language from game
-	if (lang == -1)
-		lang = self.pers["language_orig"];
-
-	// If original language is unknown, use English
-	if (lang == -1)
-		lang = 0;
-
-	self.pers["language_setting"] = lang;
-	self.pers["language"] = lang;
-
-	self iprintln("Language switched to " + lang);
-}
-
-// Called from quick settings menu when current settings is saved
-getValue()
-{
-	return self.pers["language_setting"];
-}
diff --git a/source/maps/mp/gametypes/_matchinfo.gsc b/source/maps/mp/gametypes/_matchinfo.gsc
index 6e208b1..b858f91 100644
--- a/source/maps/mp/gametypes/_matchinfo.gsc
+++ b/source/maps/mp/gametypes/_matchinfo.gsc
@@ -100,11 +100,6 @@ onConnected()
 		self.pers["matchinfo_ingame"] = false;
 		self.pers["matchinfo_ingame_visible"] = false;
 		self.pers["matchinfo_showedForSpectator"] = false;
-
-		// always hide ingame bar on first connect - if is enabled by settings, it will be showed later
-		self setClientCvarIfChanged("ui_matchinfo_ingame_show", "0");
-		self setClientCvarIfChanged("ui_matchinfo_ingame_team1_sideColor", 	""); // bg elements cannot be dependend on _show cvar, needs to be set separately
-		self setClientCvarIfChanged("ui_matchinfo_ingame_team2_sideColor", 	"");
 	}
 
 
@@ -135,19 +130,19 @@ onConnected()
 onJoinedTeam(teamName)
 {
 	// Always show for spectator, even if its not enabled in settings
-	if (teamName == "spectator")
+	if (teamName == "spectator" || teamName == "streamer")
 	{
 		self ingame_show();
 		self.pers["matchinfo_showedForSpectator"] = true;
 	}
 	else
 	{
+		// Always hide ingame bar on team join if is not enabled
+		if (!ingame_isEnabled())
+			ingame_hide();
+
 		if (self.pers["matchinfo_showedForSpectator"])
-		{
-			if (!ingame_isEnabled())
-				ingame_hide();
 			self.pers["matchinfo_showedForSpectator"] = false;
-		}
 	}
 }
 
@@ -199,12 +194,14 @@ ingame_show()
 // Hide match info ingame menu elements in hud menu
 ingame_hide()
 {
-	if (self.pers["matchinfo_ingame_visible"])
+	//if (self.pers["matchinfo_ingame_visible"])
 	{
 		self.pers["matchinfo_ingame_visible"] = false;
 		self setClientCvarIfChanged("ui_matchinfo_ingame_show", "0");
-		self setClientCvarIfChanged("ui_matchinfo_ingame_team1_sideColor", 	""); // bg elements cannot be dependend on _show cvar, needs to be set separately
-		self setClientCvarIfChanged("ui_matchinfo_ingame_team2_sideColor", 	"");
+		self setClientCvarIfChanged("ui_matchinfo_ingame_team1_color", 	""); // bg elements cannot be dependend on _show cvar, needs to be set separately
+		self setClientCvarIfChanged("ui_matchinfo_ingame_team2_color", 	"");
+		self setClientCvarIfChanged("ui_matchinfo_ingame_team1_team", 	""); // bg elements cannot be dependend on _show cvar, needs to be set separately
+		self setClientCvarIfChanged("ui_matchinfo_ingame_team2_team", 	"");
 		if (game["scr_matchinfo"] > 0)
 			self thread UpdatePlayerCvars();
 	}
@@ -486,7 +483,6 @@ GetMapName(mapname)
 }
 
 
-// May be called when
 UpdatePlayerCvars()
 {
 
@@ -550,44 +546,83 @@ UpdatePlayerCvars()
 		}
 
 
-		side_left_color = "0";
-		side_right_color = "0";
+		side_left_color = "";
+		side_right_color = "";
+		side_left_team = "";
+		side_right_team = "";
 		if (side_left == "allies")
 		{
-			if(game["allies"] == "american")
-				side_left_color = "2"; // green
-			else if(game["allies"] == "british")
+			// For streamers make allies always blue and axis always red
+			// For this there is special sufix indicating the color
+			if (self.pers["team"] == "streamer")
+			{
 				side_left_color = "3"; // blue
-			else if(game["allies"] == "russian")
-				side_left_color = "1"; // red
+				side_right_color = "1"; // red
+			}
+			else
+			{
+				if(game["allies"] == "american")
+					side_left_color = "2"; // green
+				else if(game["allies"] == "british")
+					side_left_color = "3"; // blue
+				else if(game["allies"] == "russian")
+					side_left_color = "1"; // red
+
+				side_right_color = "4"; // gray
+			}
 
-			side_right_color = "4"; // gray
+			side_left_team = game["allies"]; // american british russian
+			side_right_team = game["axis"];	 // german
 		}
 		else
 		{
-			if(game["allies"] == "american")
-				side_right_color = "2"; // green
-			else if(game["allies"] == "british")
+			// For streamers make allies always blue and axis always red
+			// For this there is special sufix indicating the color
+			if (self.pers["team"] == "streamer")
+			{
 				side_right_color = "3"; // blue
-			else if(game["allies"] == "russian")
-				side_right_color = "1"; // red
+				side_left_color = "1"; // red
+			}
+			else
+			{
+				if(game["allies"] == "american")
+					side_right_color = "2"; // green
+				else if(game["allies"] == "british")
+					side_right_color = "3"; // blue
+				else if(game["allies"] == "russian")
+					side_right_color = "1"; // red
+
+				side_left_color = "4"; // gray
+			}
 
-			side_left_color = "4"; // gray
+			side_left_team = game["axis"]; 	  // german
+			side_right_team = game["allies"]; // american british russian
 		}
 
+
+
+		// Team names
+		self setClientCvarIfChanged("ui_matchinfo_team1_name", ui_name_left);
+		self setClientCvarIfChanged("ui_matchinfo_team2_name", ui_name_right);
+
 		// Background color according to team
-		self setClientCvarIfChanged("ui_matchinfo_team1_sideColor", 	side_left_color);
-		self setClientCvarIfChanged("ui_matchinfo_team2_sideColor", 	side_right_color);
+		self setClientCvarIfChanged("ui_matchinfo_team1_color", side_left_color);
+		self setClientCvarIfChanged("ui_matchinfo_team2_color", side_right_color);
+
+		// Team
+		self setClientCvarIfChanged("ui_matchinfo_team1_team", 	side_left_team);
+		self setClientCvarIfChanged("ui_matchinfo_team2_team", 	side_right_team);
 
 		if (self.pers["matchinfo_ingame_visible"])
 		{
-			self setClientCvarIfChanged("ui_matchinfo_ingame_team1_sideColor", 	side_left_color);
-			self setClientCvarIfChanged("ui_matchinfo_ingame_team2_sideColor", 	side_right_color);
+			self setClientCvarIfChanged("ui_matchinfo_ingame_team1_color", 	side_left_color);
+			self setClientCvarIfChanged("ui_matchinfo_ingame_team2_color", 	side_right_color);
+
+			self setClientCvarIfChanged("ui_matchinfo_ingame_team1_team", 	side_left_team);
+			self setClientCvarIfChanged("ui_matchinfo_ingame_team2_team", 	side_right_team);
 		}
 
-		// Team names
-		self setClientCvarIfChanged("ui_matchinfo_team1_name", ui_name_left);
-		self setClientCvarIfChanged("ui_matchinfo_team2_name", ui_name_right);
+
 
 
 
@@ -637,10 +672,15 @@ UpdatePlayerCvars()
 		self setClientCvarIfChanged("ui_matchinfo_team1_name", "");
 		self setClientCvarIfChanged("ui_matchinfo_team2_name", "");
 
-		self setClientCvarIfChanged("ui_matchinfo_team1_sideColor", "");
-		self setClientCvarIfChanged("ui_matchinfo_team2_sideColor", "");
-		self setClientCvarIfChanged("ui_matchinfo_ingame_team1_sideColor", "");
-		self setClientCvarIfChanged("ui_matchinfo_ingame_team2_sideColor", "");
+		self setClientCvarIfChanged("ui_matchinfo_team1_color", "");
+		self setClientCvarIfChanged("ui_matchinfo_team2_color", "");
+		self setClientCvarIfChanged("ui_matchinfo_ingame_team1_color", "");
+		self setClientCvarIfChanged("ui_matchinfo_ingame_team2_color", "");
+
+		self setClientCvarIfChanged("ui_matchinfo_team1_team", "");
+		self setClientCvarIfChanged("ui_matchinfo_team2_team", "");
+		self setClientCvarIfChanged("ui_matchinfo_ingame_team1_team", "");
+		self setClientCvarIfChanged("ui_matchinfo_ingame_team2_team", "");
 
 		// Round
 		self setClientCvarIfChanged("ui_matchinfo_round", "");
@@ -813,29 +853,11 @@ refresh()
 		*** Update history cvars to be able load info in next map
 		/***********************************************************************************************************************************/
 
-		if (!game["overtime_active"])
-		{
-			game["match_team1_score_beforeOvertime"] = game["match_team1_score"];
-			game["match_team2_score_beforeOvertime"] = game["match_team2_score"];
-		}
-
 		// Save data from this map for next map
 		if ((game["match_teams_set"] || game["scr_matchinfo"] == 1) && elapsedTime > (3*60) && game["allies_score"] > 0 && game["axis_score"] > 0) // save map into hostory after 3 mins
 		{
 			setCvarIfChanged("sv_map_name", level.mapname);
-
-			// Dont update score if we are in overtime
-			if (!game["overtime_active"])
-			{
-				setCvarIfChanged("sv_map_score", game["match_team1_score"] + " : " + game["match_team2_score"]);
-			}
-			else
-			{
-				team1add = int(game["match_team1_score"] > game["match_team2_score"]);
-				team2add = int(game["match_team1_score"] < game["match_team2_score"]);
-
-				setCvarIfChanged("sv_map_score", (game["match_team1_score_beforeOvertime"] + team1add) + " : " + (game["match_team2_score_beforeOvertime"] + team2add) + "  OT");
-			}
+			setCvarIfChanged("sv_map_score", game["match_team1_score"] + " : " + game["match_team2_score"]);
 		}
 
 
diff --git a/source/maps/mp/gametypes/_menu_debug.gsc b/source/maps/mp/gametypes/_menu_debug.gsc
index 4947b2b..d7d5b5c 100644
--- a/source/maps/mp/gametypes/_menu_debug.gsc
+++ b/source/maps/mp/gametypes/_menu_debug.gsc
@@ -235,7 +235,7 @@ debugBasics()
 
 	self setClientCvar2("debug_row_2_line_24", "self attackbuttonpressed()       = " + 	self attackbuttonpressed());
 	self setClientCvar2("debug_row_2_line_25", "self isOnGround()                = " + 	self isOnGround());
-
+	self setClientCvar2("debug_row_2_line_26", "self playerAds()                 = " + 	self playerAds());
 
         //self setClientCvar2("debug_row_2_line_14", "self.dropped_weapons   = " + 		 self.dropped_weapons);
 
diff --git a/source/maps/mp/gametypes/_menu_rcon.gsc b/source/maps/mp/gametypes/_menu_rcon.gsc
index 5722319..d599aae 100644
--- a/source/maps/mp/gametypes/_menu_rcon.gsc
+++ b/source/maps/mp/gametypes/_menu_rcon.gsc
@@ -31,11 +31,12 @@ init()
 
 onConnected()
 {
-    if (!isDefined(self.pers["rcon_logged_in"]))
-    {
-        self.pers["rcon_logged_in"] = false;
-        self setClientCvar2("ui_rcon_logged_in", "0");
-    }
+	if (!isDefined(self.pers["rcon_logged_in"]))
+	{
+		self.pers["rcon_logged_in"] = false;
+
+		self setClientCvar2("ui_rcon_logged_in", "0");
+	}
 
 	self generateUUID();
 }
diff --git a/source/maps/mp/gametypes/_menu_rcon_kick.gsc b/source/maps/mp/gametypes/_menu_rcon_kick.gsc
index 00ec698..0e47e4a 100644
--- a/source/maps/mp/gametypes/_menu_rcon_kick.gsc
+++ b/source/maps/mp/gametypes/_menu_rcon_kick.gsc
@@ -66,44 +66,52 @@ generatePlayerList()
 	4 = heading
 	*/
 
+	max_lines = 22;
+
 	i = 1;
 
 	// Allies heading
-	self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "4");
-	self setClientCvarIfChanged("ui_playerlist_line_"+i+"_name", "Allies");
+	self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "4");
+	self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_name", "Allies");
 	i++;
 	if (allies.size > 0)
 	{
 		for(p = 0; p < allies.size; p++)
 		{
 			player = allies[p];
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "1");
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_name", player.name);
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_kick", "rcon clientkick " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_ban", "rcon tempBanClient " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "1");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_name", player.name);
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_kick", "rcon clientkick " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_ban", "rcon tempBanClient " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
 			i++;
+			if (i > max_lines) return;
 		}
 	}
 
+
 	// Space
-	self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "0");
+	self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "0");
 	i++;
+	if (i > max_lines) return;
 	//wait level.frame;
 
 	// Axis heading
-	self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "4");
-	self setClientCvarIfChanged("ui_playerlist_line_"+i+"_name", "Axis");
+	self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "4");
+	self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_name", "Axis");
 	i++;
+	if (i > max_lines) return;
+
 	if (axis.size > 0)
 	{
 		for(p = 0; p < axis.size; p++)
 		{
 			player = axis[p];
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "2");
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_name", player.name);
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_kick", "rcon clientkick " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_ban", "rcon tempBanClient " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "2");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_name", player.name);
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_kick", "rcon clientkick " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_ban", "rcon tempBanClient " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
 			i++;
+			if (i > max_lines) return;
 		}
 	}
 
@@ -111,22 +119,25 @@ generatePlayerList()
 	if (spec.size > 0)
 	{
 		// Space
-		self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "0");
+		self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "0");
 		i++;
+		if (i > max_lines) return;
 
 		// Spectator heading
-		self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "4");
-		self setClientCvarIfChanged("ui_playerlist_line_"+i+"_name", "Spectators");
+		self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "4");
+		self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_name", "Spectators");
 		i++;
+		if (i > max_lines) return;
 
 		for(p = 0; p < spec.size; p++)
 		{
 			player = spec[p];
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "3");
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_name", player.name);
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_kick", "rcon clientkick " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_ban", "rcon tempBanClient " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "3");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_name", player.name);
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_kick", "rcon clientkick " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_ban", "rcon tempBanClient " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
 			i++;
+			if (i > max_lines) return;
 		}
 	}
 
@@ -135,30 +146,33 @@ generatePlayerList()
 	if (none.size > 0)
 	{
 		// Space
-		self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "0");
+		self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "0");
 		i++;
+		if (i > max_lines) return;
 
 		// None heading
-		self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "4");
-		self setClientCvarIfChanged("ui_playerlist_line_"+i+"_name", "Selecting team");
+		self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "4");
+		self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_name", "Selecting team");
 		i++;
+		if (i > max_lines) return;
 
 		for(p = 0; p < none.size; p++)
 		{
 			player = none[p];
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "3");
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_name", player.name);
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_kick", "rcon clientkick " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
-			self setClientCvarIfChanged("ui_playerlist_line_"+i+"_ban", "rcon tempBanClient " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "3");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_name", player.name);
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_kick", "rcon clientkick " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
+			self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_ban", "rcon tempBanClient " + player GetEntityNumber() + "; wait 260; openscriptmenu ingame rcon_kick_refresh");
 			i++;
+			if (i > max_lines) return;
 		}
 	}
 
 
 	// Rest is space
-	for (; i <= 16; i++)
+	for (; i <= max_lines; i++)
 	{
-		self setClientCvarIfChanged("ui_playerlist_line_"+i+"_team", "0");
+		self setClientCvarIfChanged("ui_rcon_kick_line_"+i+"_team", "0");
 		//wait level.frame;
 	}
 
diff --git a/source/maps/mp/gametypes/_menu_scoreboard.gsc b/source/maps/mp/gametypes/_menu_scoreboard.gsc
index 1d7636b..75cb7de 100644
--- a/source/maps/mp/gametypes/_menu_scoreboard.gsc
+++ b/source/maps/mp/gametypes/_menu_scoreboard.gsc
@@ -25,13 +25,47 @@ onConnected()
 
 	self.pers["scoreboard_lines_statIds"] = [];
 	if (!isDefined(self.pers["scoreboard_keepRefreshing"]))
-		self.pers["scoreboard_keepRefreshing"] = false;
+		self.pers["scoreboard_keepRefreshing"] = 0;
 
 	// This will make sure menu is still responsible even if map is restarted (next round)
-	if (self.pers["scoreboard_keepRefreshing"])
+	if (self.pers["scoreboard_keepRefreshing"] > 0)
 		self thread generatePlayerList();
 }
 
+// Called also from spectatingsystem after automatically joined streamer (intermission)
+hide_scoreboard(distributed)
+{
+	self endon("disconnect");
+
+	// Streamers have visible scoreboard from previous map (intermission scoreboard)
+	self setClientCvarIfChanged("ui_scoreboard_names", "");
+	self setClientCvarIfChanged("ui_scoreboard_scores", "");
+	self setClientCvarIfChanged("ui_scoreboard_kills", "");
+	self setClientCvarIfChanged("ui_scoreboard_assists", "");
+	self setClientCvarIfChanged("ui_scoreboard_damages", "");
+	self setClientCvarIfChanged("ui_scoreboard_deaths", "");
+	self setClientCvarIfChanged("ui_scoreboard_grenades", "");
+	self setClientCvarIfChanged("ui_scoreboard_plants", "");
+	self setClientCvarIfChanged("ui_scoreboard_defuses", "");
+	self setClientCvarIfChanged("ui_scoreboard_ping", "");
+	self setClientCvarIfChanged("ui_scoreboard_visible", "0");
+
+	if (isDefined(distributed) && distributed)
+		wait level.fps_multiplier * 0.25;
+
+	// Fill empty lines
+	for(j = 1; j <= 26; j++)
+	{
+		// First line is always header and then empty space, skip
+		if (j == 2 || j == 3) continue;
+
+		self setClientCvarIfChanged("ui_scoreboard_line_" + j, "0");
+
+		if (j == 14 && isDefined(distributed) && distributed)
+			wait level.fps_multiplier * 0.25;
+	}
+}
+
 /*
 Called when command scriptmenuresponse is executed on client side
 self is player that called scriptmenuresponse
@@ -151,8 +185,10 @@ getTeamPlayersArraySorted()
 		{
 			switch(stat["team"])
 			{
-				case "allies": case "axis": case "spectator": case "none":
-				teamplayers[stat["team"]][teamplayers[stat["team"]].size] = stat;
+				case "allies": case "axis": case "spectator": case "streamer": case "none":
+				team = stat["team"];
+				if (team == "streamer") team = "spectator";
+				teamplayers[team][teamplayers[team].size] = stat;
 			}
 		}
 	}
@@ -169,7 +205,7 @@ getTeamPlayersArraySorted()
 canBeColorChanged(player)
 {
 	// Enable color change only if we are not in first readyup, only for opponent team
-	return !game["is_public_mode"] && !game["readyup_first_run"] && game["state"] != "intermission" &&
+	return !game["is_public_mode"] /*&& !game["readyup_first_run"]*/ && game["state"] != "intermission" &&
 		isDefined(player) &&
 		self.pers["team"] != player.pers["team"] &&
 		(self.pers["team"] == "allies" || self.pers["team"] == "axis") &&
@@ -251,14 +287,17 @@ addPlayerLine(team, stats)
 
 
 	name = stats["name"];
+	if (stats["isConnected"])
+		name = stats["player"].name;	// get actual player name with colors
+
 	// Final intermission scoreboard
 	if (game["state"] == "intermission")
 	{
-		if (stats["isConnected"])
-			name = stats["player"].name;	// get actual player name with colors
+		// use original player name with no changes
 	}
 	// Ingame menu scoreboard
-	else {
+	else
+	{
 		name = removeColorsFromString(name); // remove colors
 
 		if (isPlayer(stats["player"]) && isDefined(stats["player"].pers["scoreboard_color"]) && self canBeColorChanged(stats["player"]))
@@ -268,16 +307,26 @@ addPlayerLine(team, stats)
 			else if (stats["player"].pers["scoreboard_color"] == 2)
 				name = "^4" + name; // blue
 		}
+
+		if (level.in_readyup && stats["isConnected"] && isPlayer(stats["player"]))
+		{
+			if (stats["player"].isReady) 	name = "^2o^7  " + name;
+			else		 		name = "^1o^7  " + name;
+		}
 	}
+
 	// PLayer is disconnected
 	color = "";
 	if (stats["isConnected"] == false)
 	{
-		name = "[-] " + removeColorsFromString(name);
+		name = "^9[-] ^7" + name;
 		color = "^9";
 	}
 
 
+
+
+
 	if (team == "allies" || team == "axis")
 	{
 		// Add line with player stats
@@ -304,7 +353,7 @@ addPlayerLine(team, stats)
 
 
 
-		addLine(stats, color + name, color + score, color + stats["kills"], color + stats["deaths"], color + assists, color + damage, color + grenades, color + plants, color + defuses);
+		addLine(stats, name, color + score, color + stats["kills"], color + stats["deaths"], color + assists, color + damage, color + grenades, color + plants, color + defuses);
 
 		// Debug
 		//addLine(player.name, 48, 32, 18, 4, 3.7, 2, 0);
@@ -317,13 +366,16 @@ addPlayerLine(team, stats)
 }
 
 
-generatePlayerList()
+generatePlayerList(toggle)
 {
 	self endon("disconnect");
 
 	// Make sure onlny 1 thread is running
-	self notify("matchinfo_lock");
-	self endon("matchinfo_lock");
+	self notify("scoreboard_lock");
+	self endon("scoreboard_lock");
+
+	if (!isDefined(toggle))
+		toggle = false;
 
 	waittillframeend;
 
@@ -437,7 +489,7 @@ generatePlayerList()
 		self setClientCvarIfChanged("ui_scoreboard_plants", self.scoreboard.plants);
 		self setClientCvarIfChanged("ui_scoreboard_defuses", self.scoreboard.defuses);
 		self setClientCvarIfChanged("ui_scoreboard_ping", "");
-
+		self setClientCvarIfChanged("ui_scoreboard_visible", "1");
 
 
 
@@ -549,24 +601,50 @@ generatePlayerList()
 		}
 
 
+		// Keep updating even in next round after map restart
+		if (self.pers["scoreboard_keepRefreshing"] == 0)
+		{
+			self.pers["scoreboard_keepRefreshing"] = 1; // 1 = menu  2 = toggled
+			if (toggle)
+				self.pers["scoreboard_keepRefreshing"] = 2; // 1 = menu  2 = toggled
+		}
+
+		// Wait fot initial conditions
+		while(self.pers["scoreboard_keepRefreshing"] == 1 && (self.isMoving || self attackbuttonpressed()))
+			wait level.frame;
+
 		i = 0;
 		while(1)
 		{
 			wait level.frame;
 			i++;
 
-			// 1 sec elapsed
-			if (i > level.sv_fps * 1 || self attackbuttonpressed())
+			// In intermission keep updating forever
+			if (game["state"] == "intermission")
 			{
-				if ((self.sessionstate == "playing" && self.isMoving) || self attackbuttonpressed())
-				{
-					self.pers["scoreboard_keepRefreshing"] = false;	// to refresh in next round
-					return;
-				}
-				else
-					self.pers["scoreboard_keepRefreshing"] = true;
+				wait level.fps_multiplier * 1;
 				break;
 			}
+
+			// Stop scoreboard when
+			// - player is moving (so menu is closed)
+			// - player left clicked
+			// - scoreboard for spectating system is closed
+			if (self.pers["scoreboard_keepRefreshing"] == 0 || (self.pers["scoreboard_keepRefreshing"] == 1 && (self.isMoving || self attackbuttonpressed())))
+			{
+				// Stop refreshing
+				self.pers["scoreboard_keepRefreshing"] = 0;
+
+				self thread hide_scoreboard();
+
+				//self iprintln("^1CANCEL ^7updating scoreboard " + self.pers["scoreboard_keepRefreshing"] + " " + self.isMoving + " " + self attackbuttonpressed());
+
+				return;
+			}
+
+			// 1 sec elapsed, keep updating
+			if (i > level.sv_fps * 1)
+				break;
 		}
 
 		//self iprintln("updating scoreboard...");
diff --git a/source/maps/mp/gametypes/_menu_serverinfo.gsc b/source/maps/mp/gametypes/_menu_serverinfo.gsc
index 461d9f1..60594e7 100644
--- a/source/maps/mp/gametypes/_menu_serverinfo.gsc
+++ b/source/maps/mp/gametypes/_menu_serverinfo.gsc
@@ -5,7 +5,7 @@ init()
 	addEventListener("onStartGameType", ::onStartGameType);
 	addEventListener("onCvarChanged",   ::onCvarChanged);
 
-	registerCvarEx("I", "scr_motd", "STRING", "Welcome. This server is running zPAM3.32");	// ZPAM_RENAME
+	registerCvarEx("I", "scr_motd", "STRING", "Welcome. This server is running zPAM3.33");	// ZPAM_RENAME
 
 	level.motd = "";
 	level.serverversion = "";
diff --git a/source/maps/mp/gametypes/_menus.gsc b/source/maps/mp/gametypes/_menus.gsc
index 7db8600..102d260 100644
--- a/source/maps/mp/gametypes/_menus.gsc
+++ b/source/maps/mp/gametypes/_menus.gsc
@@ -16,7 +16,6 @@ onStartGameType()
 	if (!isDefined(game["menuPrecached"]))
 	{
 		game["menu_moddownload"] = "moddownload";
-		game["menu_language"] = "language";
 		game["menu_ingame"] = "ingame";
 		game["menu_team"] = "team_" + game["allies"] + game["axis"];	// team_britishgerman
 		game["menu_weapon_allies"] = "weapon_" + game["allies"];
@@ -35,7 +34,6 @@ onStartGameType()
 		game["menu_strat_records"] = "strat_records";
 
 		precacheMenu(game["menu_moddownload"]);
-		precacheMenu(game["menu_language"]);
 		precacheMenu(game["menu_ingame"]);
 		precacheMenu(game["menu_team"]);
 		precacheMenu(game["menu_weapon_allies"]);
@@ -102,13 +100,6 @@ onConnected()
 		self maps\mp\gametypes\_menu_serverinfo::updateServerInfo();
 	}
 
-	// Menu with language was not opened yet
-	else if (!isDefined(self.pers["languageLoaded"]))
-	{
-		scriptMainMenu = game["menu_language"];
-		self openMenu(game["menu_language"]);
-	}
-
 	else if (game["state"] == "intermission")
 	{
 		self setClientCvar2("ui_allow_weaponchange", 0);
@@ -156,7 +147,8 @@ onConnected()
 
 	self setClientCvar2("g_scriptMainMenu", scriptMainMenu);
 
-	self setClientCvar2("ui_allowVote", level.allowvote);
+	if (isDefined(self.pers["firstTeamSelected"]))
+		self setClientCvar2("ui_allowVote", level.allowvote);
 }
 
 onJoinedTeam(team)
@@ -183,11 +175,12 @@ onJoinedTeam(team)
 		self openMenu(game["menu_weapon_axis"]);
 		self setClientCvar2("g_scriptMainMenu", game["menu_weapon_axis"]);
 	}
-	else if (team == "spectator")
+	else if (team == "spectator" || team == "streamer")
 	{
 		self setClientCvar2("g_scriptMainMenu", game["menu_ingame"]);
 	}
 
+	self setClientCvar2("ui_allowVote", level.allowvote);
 }
 
 /*
@@ -210,31 +203,15 @@ onMenuResponse(menu, response)
 	{
 		maps\mp\gametypes\_force_download::modIsDownloaded();
 
-		/*
-		TODO LANG
-		// Open language menu
-		self closeMenu();
-		self closeInGameMenu();
-		self openMenu(game["menu_language"]);
-		self setClientCvar2("g_scriptMainMenu", game["menu_language"]);
-
-		return true;
-	}
-
-	else if (menu == game["menu_language"])
-	{
-		maps\mp\gametypes\_language::saveOriginalLanguage(response);
-		TODO LANG
-		*/
-
-		self.pers["languageLoaded"] = true;
-
 		// Open server info
 		self closeMenu();
 		self closeInGameMenu();
 		self openMenu(game["menu_serverinfo"]);
 		self setClientCvar2("g_scriptMainMenu", game["menu_serverinfo"]);
 		self maps\mp\gametypes\_menu_serverinfo::updateServerInfo();
+
+		if (game["state"] != "intermission")
+			self setClientCvar2("ui_allow_changeteam", 1);
 	}
 
 	else if(menu == game["menu_serverinfo"] && response == "close")
@@ -242,9 +219,6 @@ onMenuResponse(menu, response)
 		self closeMenu();
 		self closeInGameMenu();
 
-		if (game["state"] != "intermission")
-			self setClientCvar2("ui_allow_changeteam", 1);
-
 		if (!isDefined(self.pers["skipserverinfo"]))	// first time
 		{
 			// After serverinfo is skipped, show menu with teams
@@ -354,6 +328,14 @@ onMenuResponse(menu, response)
 				self thread printTeamChanged(self.name + " Joined Spectators", "");
 			break;
 
+		case "streamer":
+			self closeMenu();
+			self closeInGameMenu();
+			self [[level.streamer]]();
+			if(self.pers["team"] != teamBefore)
+				self thread printTeamChanged(self.name + " Joined Spectators as streamer", "");
+			break;
+
 		case "options":
 			self closeMenu();
 			self closeInGameMenu();
diff --git a/source/maps/mp/gametypes/_objective.gsc b/source/maps/mp/gametypes/_objective.gsc
index bc045fa..a3b18f2 100644
--- a/source/maps/mp/gametypes/_objective.gsc
+++ b/source/maps/mp/gametypes/_objective.gsc
@@ -51,17 +51,18 @@ setAllPlayersObjective() {
 
 setPlayerObjective()
 {
+	waittillframeend;
 
 	if (self.sessionstate == "intermission")
 	{
 		if (level.gametype != "dm")
 		{
-	        if(game["allies_score"] == game["axis_score"])
-	    		text = &"MP_THE_GAME_IS_A_TIE";
-	    	else if(game["allies_score"] > game["axis_score"])
-	    		text = &"MP_ALLIES_WIN";
-	    	else
-	    		text = &"MP_AXIS_WIN";
+		        if(game["allies_score"] == game["axis_score"])
+		    		text = &"MP_THE_GAME_IS_A_TIE";
+		    	else if(game["allies_score"] > game["axis_score"])
+		    		text = &"MP_ALLIES_WIN";
+		    	else
+		    		text = &"MP_AXIS_WIN";
 
 			self setClientCvar2("cg_objectiveText", text);
 		}
@@ -75,7 +76,7 @@ setPlayerObjective()
 			{
 				player = players[i];
 
-				if(isdefined(player.pers["team"]) && player.pers["team"] == "spectator")
+				if(player.pers["team"] != "allies" && player.pers["team"] != "axis")
 					continue;
 
 				if(!isdefined(winner))
@@ -103,12 +104,14 @@ setPlayerObjective()
 
 	if (level.in_timeout)
 	{
-		self setClientCvar2("cg_objectiveText", game["objective_timeout"]);
+		self setClientCvar2("cg_objectiveText", game["STRING_READYUP_KEY_ACTIVATE_PRESS"]);
 		return;
 	}
 
-	if (level.in_readyup) {
-		self setClientCvar2("cg_objectiveText", game["objective_readyup"]);
+	if (level.in_readyup)
+	{
+		if (level.aimTargets.size == 0)	self setClientCvar2("cg_objectiveText", game["STRING_READYUP_KEY_ACTIVATE_PRESS"] + "\n" + game["STRING_READYUP_KEY_MELEE_DOUBLEPRESS"]);
+		else				self setClientCvar2("cg_objectiveText", game["STRING_READYUP_KEY_ACTIVATE_PRESS"] + "\n" + game["STRING_READYUP_KEY_MELEE_DOUBLEPRESS"] + "\n" + game["STRING_READYUP_KEY_MELEE_HOLD"]);
 		return;
 	}
 
diff --git a/source/maps/mp/gametypes/_objpoints.gsc b/source/maps/mp/gametypes/_objpoints.gsc
index a779b21..6696f0b 100644
--- a/source/maps/mp/gametypes/_objpoints.gsc
+++ b/source/maps/mp/gametypes/_objpoints.gsc
@@ -218,9 +218,8 @@ updatePlayerObjpoints()
 	if (!level.scr_show_objective_icons)
 		return;
 
-	if(isDefined(self.pers["team"]) && self.pers["team"] != "spectator" && self.pers["team"] != "none" && self.sessionstate == "playing")
+	if(isDefined(self.pers["team"]) && (self.pers["team"] == "allies" || self.pers["team"] == "axis") && self.sessionstate == "playing")
 	{
-		assert(self.pers["team"] == "allies" || self.pers["team"] == "axis");
 		if(self.pers["team"] == "allies")
 		{
 			assert(isdefined(level.objpoints_allies));
diff --git a/source/maps/mp/gametypes/_overtime.gsc b/source/maps/mp/gametypes/_overtime.gsc
index a547554..23c3a30 100644
--- a/source/maps/mp/gametypes/_overtime.gsc
+++ b/source/maps/mp/gametypes/_overtime.gsc
@@ -9,6 +9,7 @@ init()
 	if(game["firstInit"])
 	{
 		game["overtime_active"] = false;
+		game["overtime_score"] = 0;
 
 		precacheString2("STRING_GOING_TO_OVERTIME", &"Going to Over-time");
 	}
@@ -33,17 +34,17 @@ Do_Overtime()
 
 	wait level.fps_multiplier * 5;
 
-    // Activate overtime
-    game["overtime_active"] = true;
-    logPrint("OverTime;\n");
+	// Wait for spectators in killcam
+	level maps\mp\gametypes\_spectating_system::waitForSpectatorsInKillcam();
 
+	// Activate overtime
+	game["overtime_active"] = true;
+	logPrint("OverTime;\n");
 
 
-	// Reset main scores
-	game["allies_score"] = 0;
-	game["axis_score"] = 0;
-	setTeamScore("allies", game["allies_score"]);
-	setTeamScore("axis", game["axis_score"]);
+	// Use this variable to set new end score
+	game["overtime_score"] = game["allies_score"]; // score of allies and axis should be the same when overtime is called
+
 
 	// Reset score at halfs
 	game["half_1_allies_score"] = 0;
@@ -63,6 +64,10 @@ Do_Overtime()
 	game["round"] = 0;
 
 
+	// History score for spectators
+	level maps\mp\gametypes\_spectating_system_hud::ScoreProgress_AddOvertime();
+
+
 	// Drop saved weapons
 	players = getentarray("player", "classname");
 	for(i = 0; i < players.size; i++)
diff --git a/source/maps/mp/gametypes/_pam.gsc b/source/maps/mp/gametypes/_pam.gsc
index 1026728..24e94a3 100644
--- a/source/maps/mp/gametypes/_pam.gsc
+++ b/source/maps/mp/gametypes/_pam.gsc
@@ -4,8 +4,8 @@ init()
 {
 	if(game["firstInit"])
 	{
-		precacheString2("STRING_VERSION_INFO", &"zPAM 3.32 ^3PREVIEW"); // ZPAM_RENAME
-		//precacheString2("STRING_VERSION_INFO", &"^1zPAM 3.32 TEST 2"); // ZPAM_RENAME
+		//precacheString2("STRING_VERSION_INFO", &"zPAM 3.33 ^3PREVIEW"); // ZPAM_RENAME
+		precacheString2("STRING_VERSION_INFO", &"zPAM 3.33 ^3LAN"); // ZPAM_RENAME
 	}
 }
 
diff --git a/source/maps/mp/gametypes/_players_left.gsc b/source/maps/mp/gametypes/_players_left.gsc
index e4709dd..1bfe12b 100644
--- a/source/maps/mp/gametypes/_players_left.gsc
+++ b/source/maps/mp/gametypes/_players_left.gsc
@@ -179,7 +179,7 @@ updateHUD(alliesChanged, axisChanged)
 	teamRight = "axis";
 
 	// If match info is enabled, ensure teams are in correct sides
-	if (self.pers["team"] == "spectator")
+	if (self.sessionteam == "spectator")
 	{
 		if (game["scr_matchinfo"] == 1 || game["scr_matchinfo"] == 2)
 		{
@@ -261,7 +261,7 @@ updateHUD(alliesChanged, axisChanged)
 		self.playersLeft_enemy_num setValue(level.axis_alive);
 	}
 
-	if (self.pers["team"] == "spectator")
+	if (self.sessionteam == "spectator")
 	{
 		self.playersLeft_myTeam.color = (1,1,1);
 		self.playersLeft_myTeam_num.color = (1,1,1);
@@ -344,6 +344,15 @@ hide()
 updateEnemyList()
 {
 	//self iprintln("updating...");
+
+
+	// For spectating system set invisible char to show smaller version of weapon name in HUD
+	if (self.sessionteam == "spectator")
+	{
+		self setClientCvarIfChanged("ui_playersleft_list", " ");
+		return;
+	}
+
 	if (game["is_public_mode"] || !level.scr_show_players_left || self isEnabled() == false)
 	{
 		self setClientCvarIfChanged("ui_playersleft_list", "");
@@ -377,6 +386,15 @@ updateEnemyList()
 
 			name += removeColorsFromString(playerList[i].name);
 
+			// Remove leading spaces
+			while (name.size > 0 && name[0] == " ")
+				name = getsubstr(name, 1); // start from second character
+
+			if (name == "")
+			{
+				name = "(empty name id:" + playerList[i] getentitynumber() + ")";
+			}
+
 			nameList[nameList.size] = name;
 		}
 
diff --git a/source/maps/mp/gametypes/_quickmessages.gsc b/source/maps/mp/gametypes/_quickmessages.gsc
index 249a76d..bf86543 100644
--- a/source/maps/mp/gametypes/_quickmessages.gsc
+++ b/source/maps/mp/gametypes/_quickmessages.gsc
@@ -13,7 +13,7 @@ init()
 
 quickcommands(response)
 {
-	if(!isdefined(self.pers["team"]) || self.pers["team"] == "spectator" || self.pers["team"] == "none" || isdefined(self.spamdelay))
+	if(!isdefined(self.pers["team"]) || (self.pers["team"] != "allies" && self.pers["team"] != "axis") || isdefined(self.spamdelay))
 		return;
 
 	self.spamdelay = true;
@@ -258,7 +258,7 @@ quickcommands(response)
 
 quickstatements(response)
 {
-	if(!isdefined(self.pers["team"]) || self.pers["team"] == "spectator" || self.pers["team"] == "none" || isdefined(self.spamdelay))
+	if(!isdefined(self.pers["team"]) || (self.pers["team"] != "allies" && self.pers["team"] != "axis") || isdefined(self.spamdelay))
 		return;
 
 	self.spamdelay = true;
@@ -503,7 +503,7 @@ quickstatements(response)
 
 quickresponses(response)
 {
-	if(!isdefined(self.pers["team"]) || self.pers["team"] == "spectator" || self.pers["team"] == "none" || isdefined(self.spamdelay))
+	if(!isdefined(self.pers["team"]) || (self.pers["team"] != "allies" && self.pers["team"] != "axis") || isdefined(self.spamdelay))
 		return;
 
 	self.spamdelay = true;
diff --git a/source/maps/mp/gametypes/_quicksettings.gsc b/source/maps/mp/gametypes/_quicksettings.gsc
index 8094f36..4288662 100644
--- a/source/maps/mp/gametypes/_quicksettings.gsc
+++ b/source/maps/mp/gametypes/_quicksettings.gsc
@@ -13,10 +13,15 @@ onConnected()
 	if (!isDefined(self.pers["quicksettings_saved"]))
 		self.pers["quicksettings_saved"] = false;
 
+	// Wait till response about downloaded mod from player is received - we know player is not in lag
+	while (!self.pers["modDownloaded"])
+		wait level.frame;
+
 	wait level.fps_multiplier * 1;
 
+	// Nothing get loaded, write defaults
 	if (!self.pers["quicksettings_saved"])
-		self updateClientSettings(); // write defaults
+		self updateClientSettings("defaults");
 }
 
 /*
@@ -41,7 +46,7 @@ parseString(string)
 
 	if (string.size == 0)
 	{
-		self updateClientSettings(); // write defaults
+		self updateClientSettings("empty"); // write defaults
 		return;
 	}
 
@@ -72,26 +77,22 @@ parseString(string)
 			else if (item == "playersleft")       self maps\mp\gametypes\_players_left::toggle();
 			else if (item == "playersleft_0")     self maps\mp\gametypes\_players_left::disable();
 			else if (item == "playersleft_1")     self maps\mp\gametypes\_players_left::enable();
-			/* TOTO LANG
-			else if (item == "language")          self maps\mp\gametypes\_language::toggle();
-			else if (item == "language_-1")       self maps\mp\gametypes\_language::select(-1);
-			else if (item == "language_0")        self maps\mp\gametypes\_language::select(0);
-			else if (item == "language_1")        self maps\mp\gametypes\_language::select(1);
-			else if (item == "language_2")        self maps\mp\gametypes\_language::select(2);
-			else if (item == "language_6")        self maps\mp\gametypes\_language::select(6);
-			else if (item == "language_7")        self maps\mp\gametypes\_language::select(7);
-			else if (item == "language_14")       self maps\mp\gametypes\_language::select(14);
-			else if (item == "language_15")       self maps\mp\gametypes\_language::select(15);
-			*/
+
+			else if (item == "joinspectator")       self maps\mp\gametypes\_spectating_system::join_spectator_toggle();
+			else if (item == "joinspectator_0")     self maps\mp\gametypes\_spectating_system::join_spectator_disable(true);  // true = move player into streamers
+			else if (item == "joinspectator_1")     self maps\mp\gametypes\_spectating_system::join_spectator_enable(true); // true = move player into streamers
+
 			lastItemPos = i + 1;
 		}
 	}
 
-	self updateClientSettings();
+	self updateClientSettings("after_load");
 }
 
-updateClientSettings()
+updateClientSettings(reason)
 {
+	//self iprintln("updateClientSettings("+reason+")");
+
 	string = "openscriptmenu quicksettings ";
 	delimiter = "|";
 
@@ -99,7 +100,7 @@ updateClientSettings()
 	matchinfo = self maps\mp\gametypes\_matchinfo::ingame_isEnabled();
 	score = self maps\mp\gametypes\_hud_teamscore::isEnabled();
 	playersleft = self maps\mp\gametypes\_players_left::isEnabled();
-	//language = self maps\mp\gametypes\_language::getValue(); TODO lang
+	joinspectator = self maps\mp\gametypes\_spectating_system::join_spectator_isEnabled();
 
 	string = string + "autorecording_" + recording;
 	string = string + delimiter;
@@ -107,9 +108,9 @@ updateClientSettings()
 	string = string + delimiter;
 	string = string + "score_" + score;
 	string = string + delimiter;
-	string = string + "playersleft_" + playersleft;/*
-	string = string + delimiter; TODO lang
-	string = string + "language_" + language;*/
+	string = string + "playersleft_" + playersleft;
+	string = string + delimiter;
+	string = string + "joinspectator_" + joinspectator;
 
 	self setClientCvar2("server16", string);
 
@@ -118,6 +119,7 @@ updateClientSettings()
 	self setClientCvar2("ui_quicksettings_matchinfo", matchinfo);
 	self setClientCvar2("ui_quicksettings_score", score);
 	self setClientCvar2("ui_quicksettings_playersleft", playersleft);
+	self setClientCvar2("ui_quicksettings_joinspectator", joinspectator);
 
 	self.pers["quicksettings_saved"] = true;
 }
diff --git a/source/maps/mp/gametypes/_readyup.gsc b/source/maps/mp/gametypes/_readyup.gsc
index bf46da8..e70953e 100644
--- a/source/maps/mp/gametypes/_readyup.gsc
+++ b/source/maps/mp/gametypes/_readyup.gsc
@@ -27,21 +27,14 @@ init()
 		precacheString2("STRING_READYUP_MODE_TIMEOUT", &"Time-Out Ready-Up Mode");
 		precacheString2("STRING_READYUP_MODE_OVERTIME", &"Overtime Ready-Up Mode");
 
-		// problem with precache...
-		game["STRING_READYUP_ALL_PlAYERS_ARE_READY"] = "All players are ready.";
-
-		// Readyup (problem with precache...)
-		game["readyup_team_allies"] = 		"^7You are on ^3Team Allies";
-		game["readyup_team_axis"] = 		"^7You are on ^3Team Axis";
-		game["readyup_team_spectator"] = 	"^7You are on ^3Team Spectator";
-		game["readyup_press_activate"] = 	"Press the ^3[{+activate}] ^7button to Ready-Up.";
-		game["readyup_hold_melee"] = 		"Double press the ^3[{+melee_breath}] ^7button to disable killing.";
-
-		game["readyup_timeExpired"] = 		"Time to ready-up is over.";
-		game["readyup_skip"] = 			"Set your team as ready to skip the Ready-Up.";
-
-		game["objective_readyup"] = game["readyup_press_activate"] + "\n" + game["readyup_hold_melee"];
-		game["objective_timeout"] = game["readyup_press_activate"];
+		// Strings (problem with precache...)
+		game["STRING_READYUP_KEY_ACTIVATE_PRESS"] = 		"Press the ^3[{+activate}] ^7button to Ready-Up.";
+		game["STRING_READYUP_KEY_MELEE_DOUBLEPRESS"] = 		"Double press ^3[{+melee_breath}] ^7to disable killing.";
+		game["STRING_READYUP_KEY_MELEE_DOUBLEPRESS_TRAINER"] = 	"Double press ^3[{+melee_breath}] ^7to disable killing / aim trainer.";
+		game["STRING_READYUP_KEY_MELEE_HOLD"] = 		"Hold ^3[{+melee_breath}] ^7to switch aim trainer modes.";
+		game["STRING_READYUP_ALL_PLAYERS_ARE_READY"] = 		"All players are ready.";
+		game["STRING_READYUP_TIME_EXPIRED"] = 			"Time to ready-up is over.";
+		game["STRING_READYUP_TIME_EXPIRED_SKIP"] = 		"Set your team as ready to skip the Ready-Up.";
 
 
 		precacheString2("STRING_READYUP_SELECT_TEAM", &"Select team!");
@@ -63,6 +56,7 @@ init()
 		precacheStatusIcon("party_notready");
 	}
 
+
 	// Define level default variables
 	level.in_readyup = false;
 	level.playersready = false;
@@ -294,7 +288,7 @@ onPlayerDamaging(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon
 	if (level.in_timeout || level.playersready)
 		return true;
 
-	if (self.flying)
+	if (self.flying || self.aimTrainerMode != 0)
 		return true;
 
 	if (sMeansOfDeath == "MOD_GRENADE_SPLASH")
@@ -305,7 +299,8 @@ onPlayerDamaging(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon
 		if (eAttacker.flying)
 			return true;
 
-		eAttacker enableKilling();
+		if (eAttacker.aimTrainerMode == 0)
+			eAttacker enableKilling();
 	}
 
 	if (!self.pers["killer"])
@@ -429,9 +424,9 @@ playerReadyUpThread()
 	//Set ready for bots
 	if (isDefined(self.pers["isTestClient"]))
 	{
-		self.isReady = true;
-		self.statusicon = "party_ready";
+		self setReady();
 		level thread Check_All_Ready(); // Check if all players are ready
+		self.pers["killer"] = true; // set bots killable
 		return;
 	}
 
@@ -443,8 +438,16 @@ playerReadyUpThread()
 	while((self.pers["team"] == "allies" || self.pers["team"] == "axis") && !isDefined(self.pers["weapon"]))
 		wait level.fps_multiplier * 0.1;
 
+	// Show hud
 	self thread HUD_Player_Status();
 
+	// Set ready for spectators
+	if (self.pers["team"] == "spectator" || self.pers["team"] == "streamer")
+	{
+		self setReady();
+		//level thread Check_All_Ready();
+	}
+
 	if (!level.in_timeout)
 		self thread HUD_Player_Killing_Status();
 
@@ -477,36 +480,64 @@ playerReadyUpThread()
 		}
 
 		// Disable killing
-		else if (self MeleeButtonPressed() && !level.in_timeout && (self.pers["team"] == "allies" || self.pers["team"] == "axis"))
+		else if (self MeleeButtonPressed() && !level.in_timeout)
 		{
-			catch_next = false;
-			for(i = 0; i <= level.sv_fps * 0.5; i++)
+			i = 0;
+			holdTime = 0;
+			keyReleased = false;
+			while(self.pers["team"] == "allies" || self.pers["team"] == "axis")
 			{
-				if(catch_next && self meleeButtonPressed())
+				// Half second for secondary press
+				if (i < level.sv_fps * 0.4 && keyReleased && self meleeButtonPressed())
 				{
+					if (self.aimTrainerMode == 0)
+					{
+						self iprintln("Killing was disabled");
+					}
+					else
+					{
+						self maps\mp\gametypes\_aim_trainer::turnOff();
+					}
+
 					// Disable killing
 					self disableKilling();
 
-					self iprintln("Killing was disabled");
-
 					wait level.fps_multiplier * 1;
 					break;
 				}
-				else if(!(self meleeButtonPressed()))
-					catch_next = true;
 
+				// Key was released atleast once
+				if(self meleeButtonPressed() == false)
+					keyReleased = true;
+
+				if (self meleebuttonpressed() && self playerAds() != 1)
+					holdTime += 1;
+
+				// Key was holded for some time
+				if (keyReleased == false && holdTime == level.sv_fps * 0.8)
+				{
+					self maps\mp\gametypes\_aim_trainer::toggle();
+
+					while (self meleebuttonpressed())
+						wait level.frame;
+					break;
+				}
+
+				// Exit after 1 second
+				if (i > level.sv_fps * 1)
+					break;
+
+				i++;
 				wait level.frame;
 			}
 
 		}
-		else
-			wait level.frame;
-
 
+		wait level.frame;
 	}
 
 	//self iprintlnbold("Playing ^2"+level.pam_mode+"^7 mode");
-    	self iprintlnbold(game["STRING_READYUP_ALL_PlAYERS_ARE_READY"]);
+    	self iprintlnbold(game["STRING_READYUP_ALL_PLAYERS_ARE_READY"]);
 
 
 	//self.statusicon = "party_ready";
@@ -608,7 +639,7 @@ PrintTeamAndHowToUse()
 	if ((self.pers["team"] == "allies" || self.pers["team"] == "axis") && !isAlive(self))
 		return;
 
-	if (isDefined(self.readyUp_HowToUse_Printed))
+	if (self.readyUp_HowToUse_Printed)
 		return;
 
 	// Dont print again
@@ -635,11 +666,19 @@ PrintTeamAndHowToUse()
 
 
 	// Press F for readyup
-	self iprintlnbold(game["readyup_press_activate"]);
+	self iprintlnbold(game["STRING_READYUP_KEY_ACTIVATE_PRESS"]);
 
 	// Double Press Shift to disable killing
-	if (self.pers["team"] != "spectator" && level.in_timeout == false)
-		self iprintlnbold(game["readyup_hold_melee"]);
+	if ((self.pers["team"] == "allies" || self.pers["team"] == "axis") && level.in_timeout == false)
+	{
+		if (level.aimTargets.size == 0)
+			self iprintlnbold(game["STRING_READYUP_KEY_MELEE_DOUBLEPRESS"]);
+		else
+		{
+			self iprintlnbold(game["STRING_READYUP_KEY_MELEE_DOUBLEPRESS_TRAINER"]);
+			self iprintlnbold(game["STRING_READYUP_KEY_MELEE_HOLD"]);
+		}
+	}
 
 
 	// Length of readyup
@@ -712,6 +751,9 @@ ReadyUp_AutoResume(minutes)
 		if (player maps\mp\gametypes\_bots::isBot())
 			continue;
 
+		if (player.pers["team"] != "allies" && player.pers["team"] != "axis")
+			continue;
+
 		player unsetReady();
 
 	}
@@ -1077,8 +1119,8 @@ HUD_ReadyUp_ResumingIn_ExtraTime()
         level.setYourTeamAsReady.color = (1, 0, 0);
 	level.setYourTeamAsReady setText(game["STRING_READYUP_SET_YOUR_TEAM_AS_READY"]);
 
-	iprintlnbold(game["readyup_timeExpired"]);
-	iprintlnbold(game["readyup_skip"]);
+	iprintlnbold(game["STRING_READYUP_TIME_EXPIRED"]);
+	iprintlnbold(game["STRING_READYUP_TIME_EXPIRED_SKIP"]);
 
 	// Red extra time
 	level.ht_resume_clock_extra = newHudElem2();
diff --git a/source/maps/mp/gametypes/_record.gsc b/source/maps/mp/gametypes/_record.gsc
index fd8817e..78a45a2 100644
--- a/source/maps/mp/gametypes/_record.gsc
+++ b/source/maps/mp/gametypes/_record.gsc
@@ -370,6 +370,10 @@ execRecording()
 
 	//self iprintln("exec record");
 
+	// Ignore bots
+	if (isDefined(self.pers["isTestClient"]))
+		return;
+
 	// Auto recording is turned off by player, print atleast warning message
 	if (!self isEnabled())
 	{
@@ -398,7 +402,7 @@ execRecording()
 		//			(mouse will be visible with clear backgorund.... so closeMenu() is called to close that menu)
 		self closeMenu();
 		self closeInGameMenu();
-		self setClientCvar2("exec_cmd", "stoprecord; record " + demoName + "; openScriptMenu exec_cmd start_recording");
+		self setClientCvar2("exec_cmd", "stoprecord; record " + demoName + "; openScriptMenu exec_cmd start_recording"); // TODO clear;
 		self openMenu(game["menu_exec_cmd"]);		// open menu via script
 		self closeMenu();				// will only close menu opened by script
 
@@ -461,7 +465,7 @@ stopRecording()
 		}
 
 		// Wait a second before next menu opening
-		for (i = 0; i < 9 && !self.pers["recording_executed"]; i++)
+		for (i = 0; i < 9 && !self.pers["recording_stop_executed"]; i++)
 			wait level.fps_multiplier * .1;
 	}
 
diff --git a/source/maps/mp/gametypes/_round_report.gsc b/source/maps/mp/gametypes/_round_report.gsc
index d2472b3..3acb433 100644
--- a/source/maps/mp/gametypes/_round_report.gsc
+++ b/source/maps/mp/gametypes/_round_report.gsc
@@ -242,8 +242,8 @@ print()
 	hitLocTexts["head"] = "Head";
 	hitLocTexts["neck"] = "Neck";
 
-	hitLocTexts["torso_upper"] = "Body";
-	hitLocTexts["torso_lower"] = "Body";
+	hitLocTexts["torso_upper"] = "Torso-upper";
+	hitLocTexts["torso_lower"] = "Torso-lower";
 
 	hitLocTexts["left_arm_upper"] = "Shoulder";
 	hitLocTexts["left_arm_lower"] = "Arm";
diff --git a/source/maps/mp/gametypes/_spectating.gsc b/source/maps/mp/gametypes/_spectating.gsc
index 1eb3661..5c699ea 100644
--- a/source/maps/mp/gametypes/_spectating.gsc
+++ b/source/maps/mp/gametypes/_spectating.gsc
@@ -2,15 +2,11 @@
 
 init()
 {
-	level.spectatingSystem = false;
-
-	if (!game["is_public_mode"] && (level.gametype == "sd" || level.gametype == "tdm" || level.gametype == "dm" || level.gametype == "ctf" || level.gametype == "hq" || level.gametype == "htf" || level.gametype == "re"))
-		level.spectatingSystem = true;
-
 	addEventListener("onCvarChanged", ::onCvarChanged);
 
 	registerCvar("scr_spectatefree", "BOOL", 0);
 	registerCvar("scr_spectateenemy", "BOOL", 0);
+	registerCvar("scr_spectatingsystem", "BOOL", 0);
 
 	addEventListener("onJoinedTeam",    ::onJoinedTeam);
 	addEventListener("onSpawned",    ::onSpawned);
@@ -34,6 +30,14 @@ onCvarChanged(cvar, value, isRegisterTime)
 			if (!isRegisterTime)
 				level thread setSpectatePermissionsToAll();
 			return true;
+
+		case "scr_spectatingsystem":
+			if (isRegisterTime)
+				level.spectatingSystem = value;
+			else
+				iprintln("Map needs to be restarted to apply the changes.");
+			return true;
+
 	}
 	return false;
 }
diff --git a/source/maps/mp/gametypes/_spectating_auto.gsc b/source/maps/mp/gametypes/_spectating_auto.gsc
deleted file mode 100644
index 0957a27..0000000
--- a/source/maps/mp/gametypes/_spectating_auto.gsc
+++ /dev/null
@@ -1,1300 +0,0 @@
-#include maps\mp\gametypes\global\_global;
-
-init()
-{
-	if(game["firstInit"])
-	{
-		precacheString2("STRING_AUTO_SPECTATING", 				&"Auto-spectating");
-		precacheString2("STRING_AUTO_SPECTATING_OFF", 				&"Auto-spectating off");
-		precacheString2("STRING_AUTO_SPECTATING_REASON_MANUAL", 		&"Manual change");
-		precacheString2("STRING_AUTO_SPECTATING_REASON_VISIBLE_ENEMY", 		&"Enemy in sight");
-		precacheString2("STRING_AUTO_SPECTATING_REASON_VISIBLE_BY_ENEMY", 	&"Spotted by enemy");
-		precacheString2("STRING_AUTO_SPECTATING_REASON_BOMB_PLANTED", 		&"Bomb planted");
-		precacheString2("STRING_AUTO_SPECTATING_REASON_BOMB_SCORE", 		&"Follow loosing team");
-		precacheString2("STRING_AUTO_SPECTATING_REASON_LAST_PLAYER", 		&"Last player in team");
-		precacheString2("STRING_AUTO_SPECTATING_REASON_1V1_SCORE", 		&"1v1 loosing team");
-		precacheString2("STRING_AUTO_SPECTATING_REASON_NO_ACTION_NEARBY", 	&"Next to each other");
-		precacheString2("STRING_AUTO_SPECTATING_REASON_NO_ACTION_MOVING", 	&"Follow moving player");
-		precacheString2("STRING_AUTO_SPECTATING_REASON_RADIO_DEFEND", 		&"Radio defending team");
-
-		game["STRING_AUTO_SPECT_IS_ENABLED"] = 		"Auto-spectator is ^2On";
-		game["STRING_AUTO_SPECT_IS_DISABLED"] = 	"Auto-spectator is ^1Off";
-		game["STRING_AUTO_SPECT_NAMES_ON"] = 		"XRAY ^2On";
-		game["STRING_AUTO_SPECT_NAMES_OFF"] = 		"XRAY ^1Off";
-	}
-
-	level.autoSpectating_do = false;
-	level.autoSpectating_ID = -1;		// spectated player
-	level.autoSpectating_spectatedPlayer = undefined;
-	level.autoSpectating_noSwitchUntill = 0;
-	level.autoSpectating_HUD_text = "";
-
-	if (!isDefined(game["spectatingSystem_recommandedPlayerMode_teamLeft_player"]) || level.gametype != "sd" || game["round"] == 0) // round in case of bash
-		game["spectatingSystem_recommandedPlayerMode_teamLeft_player"] = undefined;
-	if (!isDefined(game["spectatingSystem_recommandedPlayerMode_teamRight_player"]) || level.gametype != "sd" || game["round"] == 0) // round in case of bash
-		game["spectatingSystem_recommandedPlayerMode_teamRight_player"] = undefined;
-
-	if (!level.spectatingSystem || level.in_readyup)
-	{
-		return;
-	}
-
-	addEventListener("onConnected",  	::onConnected);
-	addEventListener("onConnectedAll",    	::onConnectedAll);
-	addEventListener("onSpawnedPlayer",  	::onSpawnedPlayer);
-	addEventListener("onSpawnedSpectator",  ::onSpawnedSpectator);
-	addEventListener("onPlayerDamaged", 	::onPlayerDamaged);
-	addEventListener("onPlayerKilled", 	::onPlayerKilled);
-
-	//setCvar("debug_spectator", 1);
-}
-
-onConnected()
-{
-	if (!isDefined(self.pers["autoSpectating"]))
-		self.pers["autoSpectating"] = false;
-	self.autoSpectating_inCinematic = false;
-	self.freeSpectating = true; // free spectating, not following any player
-}
-
-onConnectedAll()
-{
-	thread checkSpectatorTeam();
-	thread playersCanSeeEachOthers();
-	thread playersCloseToEachOther();
-	thread autoFollowedPlayer();
-}
-
-onSpawnedSpectator()
-{
-	if (self.pers["team"] == "spectator")
-	{
-		// enable auto-spectator feaures
-		self thread autoSpectator();
-	}
-}
-
-onSpawnedPlayer()
-{
-}
-
-
-/*
-Called when player has taken damage.
-self is the player that took damage.
-*/
-onPlayerDamaged(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime)
-{
-
-}
-
-/*
-Called when player is killed
-self is the player that was killed.
-*/
-onPlayerKilled(eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration)
-{
-	self thread switchNextPlayerForNonAutoSpectators();
-}
-
-switchNextPlayerForNonAutoSpectators()
-{
-	self endon("disconnect");
-
-	wait level.fps_multiplier * 1;
-
-	players = getentarray("player", "classname");
-	for(i = 0; i < players.size; i++)
-	{
-		spectator = players[i];
-		if (spectator != self && spectator.sessionteam == "spectator" && !spectator.pers["autoSpectating"] && spectator.spectatorclient == -1 && !spectator.isMoving)
-		{
-			// When spectator is following a player, player origin is not changing (player is in last free spectating position)
-			// only angles are changing wich follows spectated player angles
-			if (spectator getPlayerAngles() == self getPlayerAngles())
-			{
-				nextPlayer = getNextPlayerFrom(self);
-				if (!isDefined(nextPlayer))
-					return;
-
-				//spectator iprintln("I was following " + self.name);
-				spectator thread followPlayer_nonAutoSpec(nextPlayer);
-
-				if (level.debug_spectator) spectator iprintln("^9Auto follow next player for classic spectator");
-			}
-		}
-	}
-}
-
-
-
-
-// Check if any spectator is in auto-spectating mode
-checkSpectatorTeam()
-{
-	for(;;)
-	{
-		autospectator_exists = false;
-		players = getentarray("player", "classname");
-		for(i = 0; i < players.size; i++)
-		{
-			player = players[i];
-			if (player.pers["team"] == "spectator" && player.pers["autoSpectating"])
-			{
-				autospectator_exists = true;
-				break;
-			}
-		}
-
-		level.autoSpectating_do = autospectator_exists;
-
-		// Enable archive for killcam
-		if (level.autoSpectating_do)
-			maps\mp\gametypes\_archive::update();
-
-		wait level.fps_multiplier * 1;
-	}
-}
-
-printToAutoSpectators(text)
-{
-	players = getentarray("player", "classname");
-	for(i = 0; i < players.size; i++)
-	{
-		player = players[i];
-		if (player.pers["team"] == "spectator" && player.pers["autoSpectating"])
-		{
-			player iprintln(text);
-			break;
-		}
-	}
-}
-
-
-// self.spectatorclient is used to force spectating player
-// By default is -1 - dont force
-// Other number represents spectated client id
-// If is set, player is not able to change spectated player
-// self.spectatorclient does not show actually spectated player
-autoSpectator()
-{
-	self endon("disconnect");
-
-	// Wait untill readyup is over (used when timeout is called in time based gametypes and somebody connect)
-	while(level.in_readyup)
-	{
-		if (self.pers["team"] != "spectator") // leaved spectator in timeout
-			return;
-		wait level.fps_multiplier * 1;
-	}
-
-	autoSpectatorEnable(); // enable by default
-
-	self thread maps\mp\gametypes\_spectating_hud_esp::ESP_Loop();
-
-	self thread maps\mp\gametypes\_spectating_hud::keys_help();
-
-	wait level.frame* 3;
-
-	inKillcam = false;
-	self.waitForAttackKeyRelease = false;
-	self.waitForMeleeKeyRelease = false;
-	self.waitForUseKeyRelease = false;
-
-	hud_text_last = "";
-
-	angles_last = undefined;
-
-	for(;;)
-	{
-		wait level.frame;
-
-		// End this thread if player join team
-		if (self.pers["team"] != "spectator")
-		{
-			self autoSpectatorDisable();
-			self autoSpectatorExit();
-			break;
-		}
-
-		// Use own variable to suppress double F press
-		if (isDefined(self.killcam))
-			inKillcam = true;
-		else if (!(self usebuttonpressed()))
-			inKillcam = false;
-
-
-		// Skip these key checks if we are in killcam
-		if (inKillcam)
-			continue;
-
-		// Wait untill timeout is over
-		if (level.in_readyup)
-		{
-			self autoSpectatorDisable();
-			self autoSpectatorExit();
-
-			while (level.in_readyup)
-				wait level.fps_multiplier * 1;
-
-			self autoSpectatorEnable();
-		}
-
-
-
-		// Key attack
-		if(self attackbuttonpressed() && !self.waitForAttackKeyRelease)
-		{
-			self.waitForAttackKeyRelease = true;
-			self thread handleAttackButtonPress();
-		}
-
-		// Key Shift
-		if(self meleebuttonpressed() && !self.waitForMeleeKeyRelease)
-		{
-			self.waitForMeleeKeyRelease = true;
-			self thread handleMeleeButtonPress();
-		}
-
-		// Key F
-		if(self usebuttonpressed() && !self.waitForUseKeyRelease && !self.autoSpectating_killcamProposingVisible)	// Ignore F press is killcam proposing is visible
-		{
-			self.waitForUseKeyRelease = true;
-			self thread handleUseButtonPress();
-		}
-
-
-		// For autospectating players make sure they always follow somebody
-		if (self.pers["autoSpectating"] && !self.autoSpectating_inCinematic && !isDefined(self.killcam) && level.autoSpectating_ID != self.spectatorclient)
-		{
-			self.spectatorclient = level.autoSpectating_ID;
-
-			//if (level.debug_spectator) self iprintln("^8 set self.spectatorclient="+level.autoSpectating_ID);
-
-			self.freeSpectating = false; // free spectating ended, now following a player
-		}
-
-		// Update text with follow reason
-		if (self.pers["autoSpectating"])
-		{
-			if (level.autoSpectating_HUD_text != "" && level.autoSpectating_HUD_text != hud_text_last)
-			{
-				self.autoSpectatingText setText(game[level.autoSpectating_HUD_text]);
-			}
-			hud_text_last = level.autoSpectating_HUD_text;
-		}
-
-	}
-}
-
-
-
-handleAttackButtonPress()
-{
-	self endon("disconnect");
-
-	// Start following nearby player
-	spec_follow = undefined;
-	if (self.freeSpectating && isDefined(self.spec_follow) && !self.pers["autoSpectating"])
-	{
-		if (level.debug_spectator) self iprintln("attackBtn> follow close by player");
-
-		spec_follow = self.spec_follow;
-
-		self.spectatorclient = self.spec_follow getEntityNumber();
-
-		wait level.frame;
-
-		self.spectatorclient = -1;
-	}
-
-	self.freeSpectating = false; // free spectating ended, now following a player
-	if (level.debug_spectator) self iprintln("attackBtn> self.freeSpectating = ^1false");
-
-	// if is pressed for 0.5 sec
-	holded = false;
-	i = 0;
-	while(self attackbuttonpressed())
-	{
-		i += level.frame;
-		if (i > 0.5)
-		{
-			holded = true;
-			break;
-		}
-		wait level.frame;
-	}
-
-	if (holded)
-	{
-		if (!self.pers["autoSpectating"])
-		{
-			self autoSpectatorEnable();
-			self iprintln(game["STRING_AUTO_SPECT_IS_ENABLED"]);
-		}
-		else
-		{
-			selectedPlayer = level getPreviousPlayerFrom(level.autoSpectating_spectatedPlayer);
-			if (isDefined(selectedPlayer))
-			{
-				level followPlayer(selectedPlayer);
-				level.autoSpectating_noSwitchUntill = gettime() + 15000; // wait some time untill next change
-				level.autoSpectating_HUD_text = "STRING_AUTO_SPECTATING_REASON_MANUAL";
-			}
-		}
-	}
-	else
-	{
-		if (self.pers["autoSpectating"])
-		{
-			selectedPlayer = level getNextPlayerFrom(level.autoSpectating_spectatedPlayer);
-			if (isDefined(selectedPlayer))
-			{
-				level followPlayer(selectedPlayer);
-				level.autoSpectating_noSwitchUntill = gettime() + 15000; // wait some time untill next change
-				level.autoSpectating_HUD_text = "STRING_AUTO_SPECTATING_REASON_MANUAL";
-			}
-		}
-	}
-
-	while(self attackbuttonpressed())
-		wait level.frame;
-
-	self.waitForAttackKeyRelease = false;
-}
-
-
-handleMeleeButtonPress()
-{
-	self endon("disconnect");
-
-	// We are not auto-spectating - what ever spectator state is, now we pressed shift for freespectating
-	if (!self.pers["autoSpectating"])
-	{
-		self.freeSpectating = true; // free spectating, not following any player
-		if (level.debug_spectator) self iprintln("meleeBtn> self.freeSpectating = ^2true");
-	}
-
-	while(self meleeButtonPressed())
-		wait level.frame;
-
-	if (self.pers["autoSpectating"])
-	{
-		autoSpectatorDisable();
-		self iprintln(game["STRING_AUTO_SPECT_IS_DISABLED"]);
-
-		self.freeSpectating = false; // no free spectating - we still follow the same player
-		if (level.debug_spectator) self iprintln("attackBtn> self.freeSpectating = ^1false");
-	}
-
-
-
-
-
-	self.waitForMeleeKeyRelease = false;
-}
-
-handleUseButtonPress()
-{
-	self endon("disconnect");
-
-	// if is pressed for 0.5 sec
-	holded = false;
-	i = 0;
-	while(self useButtonPressed())
-	{
-		i += level.frame;
-		if (i > 0.5)
-		{
-			holded = true;
-			break;
-		}
-		wait level.frame;
-	}
-
-	if (holded)
-	{
-		self.pers["autoSpectatingESP"] = !self.pers["autoSpectatingESP"];
-		if (self.pers["autoSpectatingESP"]) 	self iprintln(game["STRING_AUTO_SPECT_NAMES_ON"]);
-		else					self iprintln(game["STRING_AUTO_SPECT_NAMES_OFF"]);
-	}
-	else
-	{
-		if (level.debug_spectator) self iprintln("(menu was opened)");
-
-		if (!self.pers["autoSpectating"])
-		{
-			self autoSpectatorEnable();
-			self iprintln(game["STRING_AUTO_SPECT_IS_ENABLED"]);
-		}
-
-		self maps\mp\gametypes\_spectating_killcam::openSpectMenu();
-
-		// Because session state is changed from spectator to dead for a frame, spectated player is stopped
-		if (self.spectatorclient == -1)
-			self.freeSpectating = true; // free spectating, not following any player
-	}
-
-	while(self useButtonPressed())
-		wait level.frame;
-
-	self.waitForUseKeyRelease = false;
-}
-
-
-
-
-autoSpectatorEnable()
-{
-	if (level.in_readyup)
-		return;
-
-	self.pers["autoSpectating"] = true;
-
-
-	if(!isdefined(self.autoSpectatingBG))
-	{
-		self.autoSpectatingBG = newClientHudElem2(self);
-		self.autoSpectatingBG.archived = false;
-		self.autoSpectatingBG.x = -40;
-		self.autoSpectatingBG.y = 40;
-		self.autoSpectatingBG.horzAlign = "center";
-		self.autoSpectatingBG.vertAlign = "top";
-		self.autoSpectatingBG setShader("black", 80, 10);
-	}
-
-	// Auto-spectating
-	if(!isdefined(self.autoSpectatingText))
-	{
-		self.autoSpectatingText = newClientHudElem2(self);
-		self.autoSpectatingText.horzAlign = "center";
-		self.autoSpectatingText.vertAlign = "top";
-		self.autoSpectatingText.alignX = "center";
-		self.autoSpectatingText.alignY = "top";
-		self.autoSpectatingText.x = 0;
-		self.autoSpectatingText.y = 42;
-		self.autoSpectatingText.archived = false;
-		self.autoSpectatingText.font = "default";
-		self.autoSpectatingText.alpha = 0.9;
-		self.autoSpectatingText.sort = 2;
-		self.autoSpectatingText.fontscale = 0.6;
-	}
-
-	self.autoSpectatingBG.alpha = 0.5;
-	self.autoSpectatingText setText(game["STRING_AUTO_SPECTATING"]);
-}
-
-
-autoSpectatorDisable()
-{
-	self.pers["autoSpectating"] = false;
-	self.spectatorclient = -1;
-
-	self.autoSpectatingBG.alpha = 0;
-	self.autoSpectatingText setText(game["STRING_AUTO_SPECTATING_OFF"]);
-}
-
-autoSpectatorExit()
-{
-	if(isdefined(self.autoSpectatingBG))
-	{
-		self.autoSpectatingBG destroy2();
-		self.autoSpectatingBG = undefined;
-	}
-	if(isdefined(self.autoSpectatingText))
-	{
-		self.autoSpectatingText destroy2();
-		self.autoSpectatingText = undefined;
-	}
-
-	self thread maps\mp\gametypes\_spectating_hud::keys_hide();
-}
-
-
-cinematicMove()
-{
-	self endon("disconnect");
-
-	wait level.frame; // wait untill all players are spawned
-
-	// For some reason, sometimes classname of spectator is not player and linkto() func does not work
-	// Error: entity (classname: 'noclass') does not currently support linkTo:
-	// this should avoid error
-	if (self.classname != "player")
-		return;
-
-	if (level.autoSpectating_ID == -1)
-	{
-		return;
-	}
-
-	player = level.autoSpectating_spectatedPlayer;
-
-	stratime = 6; // 6
-	if (isDefined(level.strat_time)) stratime = level.strat_time;
-	length = stratime * 0.83333; // 5
-	acceleration = stratime * 0.5; // 3
-	deceleration = length - acceleration; // 2
-
-
-	origin = player.origin - (0, 0, 20);
-	angles = (12, player.angles[1] + 180, 0);
-	forward = AnglesToForward(angles); // 1.0 scale
-
-	dist = -50; // how far
-	originStart = origin + (forward[0] * dist, forward[1] * dist, forward[2] * dist); // new pos
-
-	dist = -50 + (-150 * (stratime / 6)); // how far
-	originEnd = origin + (forward[0] * dist, forward[1] * dist, forward[2] * dist); // new pos
-
-	//self iprintln(originStart);
-	//self iprintln(originEnd);
-
-	self.autoSpectating_inCinematic = true;
-
-	self.freeSpectating = false; // free spectating ended, now following a player
-
-
-
-
-	self.spectatorLock = spawn("script_model", originStart);
-	self.spectatorLock.angles = angles;
-
-	self setOrigin(originStart);
-	self setPlayerAngles(angles);
-	self linkto(self.spectatorLock);
-
-	// 3 2.49 1.5  0.99
-
-	self.spectatorLock moveTo(originEnd, length, acceleration, deceleration);
-
-	startTime = getTime();
-	for(;;)
-	{
-		if (self attackbuttonpressed() || self meleebuttonpressed())
-			break;
-
-		if ((gettime() - startTime) > (length * 1000))
-			break;
-
-		wait level.frame;
-	}
-
-	self unlink();
-
-	self.autoSpectating_inCinematic = false;
-
-	// If we are still in autospectator (not cnceled during cinematic)
-	if (!self.pers["autoSpectating"])
-		self.freeSpectating = true;
-	else
-		self.spectatorclient =  level.autoSpectating_ID;
-}
-
-
-getRecommandedPlayer()
-{
-	if (level.gametype != "sd")
-	{
-		return findBestPlayer();
-	}
-
-	// If match info is enabled, ensure teams are in correct sides
-	teamLeft = "allies";
-	teamRight = "axis";
-	if ((game["scr_matchinfo"] == 1 || game["scr_matchinfo"] == 2) && game["match_team1_side"] == "axis")
-	{
-		teamLeft = "axis";
-		teamRight = "allies";
-	}
-
-	/*
-	Follow in this direction:
-	Round	TEAM1	TEAM2
-	1	sniper
-	2		sniper
-	3	best
-	4		best
-	5	p1
-	6		p1
-	7	p2
-	8		p2
-	9	best
-	10		best
-	11	p1
-	12		p1
-	13	p2
-	14		p2
-	15	...	...
-
-
-	*/
-
-
-	selectedPlayer = undefined;
-
-
-	// Team left
-	if (game["round"] % 2 != 0)
-	{
-		if (game["round"] == 1)
-		{
-			// Find sniper of first team
-			selectedPlayer = findSniper(teamLeft);
-			game["spectatingSystem_recommandedPlayerMode_teamLeft_player"] = selectedPlayer;
-		}
-		if (game["round"] % 3 == 0) // every 3. rounds
-		{
-			// Find best player with the most kills
-			selectedPlayer = findBestPlayer(teamLeft);
-		}
-	}
-	// Team right
-	else
-	{
-		if (game["round"] == 2)
-		{
-			// Find sniper of first team
-			selectedPlayer = findSniper(teamRight);
-			game["spectatingSystem_recommandedPlayerMode_teamRight_player"] = selectedPlayer;
-		}
-		else if ((game["round"]-1) % 3 == 0) // every 3. rounds
-		{
-			// Find best player with the most kills
-			selectedPlayer = findBestPlayer(teamRight);
-		}
-
-	}
-
-
-	// Find next player in row as default
-	if (!isDefined(selectedPlayer))
-	{
-		// Team left
-		if (game["round"] % 2 != 0)
-		{
-			selectedPlayer = getNextPlayerFrom(game["spectatingSystem_recommandedPlayerMode_teamLeft_player"], teamLeft);
-			game["spectatingSystem_recommandedPlayerMode_teamLeft_player"] = selectedPlayer;
-
-			printToAutoSpectators("Following next player in team " + teamLeft);
-		}
-		// Team right
-		else
-		{
-			selectedPlayer = getNextPlayerFrom(game["spectatingSystem_recommandedPlayerMode_teamRight_player"], teamRight);
-			game["spectatingSystem_recommandedPlayerMode_teamRight_player"] = selectedPlayer;
-
-			printToAutoSpectators("Following next player in team " + teamRight);
-		}
-
-	}
-
-	return selectedPlayer;
-}
-
-findSniper(team)
-{
-	selectedPlayer = undefined;
-	players = getentarray("player", "classname");
-	for(i = 0; i < players.size; i++)
-	{
-		player = players[i];
-		if ((player.pers["team"] == team) && player.sessionstate == "playing" && isDefined(player.pers["weapon"]))
-		{
-			weaponData = level.weapons[player.pers["weapon"]];
-
-			if (isDefined(weaponData) && weaponData.classname == "sniper")
-			{
-				selectedPlayer = player;
-
-				printToAutoSpectators("Following sniper in team " + team + ": " + player.name );
-				//if (level.debug_spectator) printToAutoSpectators("Spect: selecting sniper: " + player.name + "  in team " + team);
-
-				break;
-			}
-		}
-	}
-	return selectedPlayer;
-}
-
-findBestPlayer(team)
-{
-	lastPlayer = undefined;
-
-	if (!isDefined(team))
-		team = "all";
-
-	// Select player to watch by score and time
-	players = getentarray("player", "classname");
-	for(i = 0; i < players.size; i++)
-	{
-		player = players[i];
-		if ((team == "all" || player.pers["team"] == team) && player.sessionstate == "playing")
-		{
-			if (!isDefined(lastPlayer) ||
-			  player.score > lastPlayer.score ||
-			  (player.score == lastPlayer.score && player.deaths < lastPlayer.deaths))
-				lastPlayer = player;
-		}
-	}
-
-	if (isDefined(lastPlayer))
-	{
-		printToAutoSpectators("Following best player in team " + team + ": " + lastPlayer.name );
-		//if (level.debug_spectator) printToAutoSpectators("Spect: selecting best player: " + lastPlayer.name + "  in team " + team);
-		return lastPlayer;
-	}
-	else
-		return undefined;
-}
-
-getPreviousPlayerFrom(actualSpectatedPlayer, team)
-{
-	return getPlayerFrom(actualSpectatedPlayer, team, true);
-}
-
-getNextPlayerFrom(actualSpectatedPlayer, team)
-{
-	return getPlayerFrom(actualSpectatedPlayer, team, false);
-}
-
-
-getPlayerFrom(actualSpectatedPlayer, team, reverse)
-{
-	selectedPlayer = undefined;
-	useNextId = false;
-/*
-	if (isDefined(actualSpectatedPlayer))
-		iprintln("getNextPlayerFrom " + actualSpectatedPlayer.name);
-	else
-		iprintln("getNextPlayerFrom undefined");
-*/
-
-	// Join teams
-	players = maps\mp\gametypes\_spectating_hud::getPlayersSortedByScore();
-	playersFinal = [];
-	if (!isDefined(team) || team == "allies")
-	{
-		for (i = 0; i < players.size; i++)
-		{
-			if (players[i].pers["team"] == "allies")
-				playersFinal[playersFinal.size] = players[i];
-		}
-	}
-	// PLayers from allies should be selected, but the team is empty -> follow from both teams
-	if (isDefined(team) && team == "allies" && playersFinal.size == 0)
-		return getPlayerFrom(actualSpectatedPlayer, undefined, reverse);
-
-
-	if (!isDefined(team) || team == "axis")
-	{
-		for (i = 0; i < players.size; i++)
-		{
-			if (players[i].pers["team"] == "axis")
-				playersFinal[playersFinal.size] = players[i];
-		}
-	}
-	// PLayers from allies should be selected, but the team is empty -> follow from both teams
-	if (isDefined(team) && team == "axis" && playersFinal.size == 0)
-		return getPlayerFrom(actualSpectatedPlayer, undefined, reverse);
-
-
-	for(i = 0; i < playersFinal.size; i++)
-	{
-		player = playersFinal[i];
-
-		//iprintln("--" + player.name);
-
-		// Skip dead players
-		if (player.sessionstate != "playing")
-			continue;
-
-
-		if (reverse)
-		{
-			// Previous player is saved in selectedPlayer
-			if (isDefined(selectedPlayer) && isDefined(actualSpectatedPlayer) && actualSpectatedPlayer == player)
-				break;
-
-			selectedPlayer = player;
-		}
-		else
-		{
-			// Save first player in case actually folowed player is the last one
-			if (!isDefined(selectedPlayer))
-				selectedPlayer = player;
-
-			if (useNextId)
-			{
-				selectedPlayer = player;
-				break;
-			}
-
-			// If this player is actually followed, next player is the one we will follow next
-			if (isDefined(actualSpectatedPlayer) && actualSpectatedPlayer == player)
-				useNextId = true;
-		}
-
-
-
-
-	}
-
-	// Debug print
-	if (isDefined(selectedPlayer))
-	{
-		teamStr = "from both teams"; if (isDefined(team)) teamStr = "in team " + team;
-		if (level.debug_spectator) printToAutoSpectators("Spect: selecting next player "+teamStr+": " + selectedPlayer.name);
-	}
-
-	return selectedPlayer;
-}
-
-
-
-followPlayer(selectedPlayer)
-{
-	level.autoSpectating_ID = selectedPlayer getEntityNumber();
-	level.autoSpectating_spectatedPlayer = selectedPlayer;
-	level.autoSpectating_lastChange = getTime();
-
-	//if (level.debug_spectator) printToAutoSpectators("Spect: set followed player: " + selectedPlayer.name);
-}
-
-followPlayer_nonAutoSpec(selectedPlayer)
-{
-	self.spectatorclient = selectedPlayer getEntityNumber();
-
-	wait level.frame;
-
-	self.spectatorclient = -1;
-}
-
-followNextPlayer()
-{
-	selectedPlayer = undefined;
-
-	// First try to find player from the same team
-	if (isDefined(level.autoSpectating_spectatedPlayer))
-	{
-		selectedPlayer = getNextPlayerFrom(level.autoSpectating_spectatedPlayer, level.autoSpectating_spectatedPlayer.pers["team"]);
-	}
-
-	// If not found, select from both teams
-	if (!isDefined(selectedPlayer))
-	{
-		selectedPlayer = getNextPlayerFrom(level.autoSpectating_spectatedPlayer);
-	}
-
-	if (isDefined(selectedPlayer))
-	{
-		followPlayer(selectedPlayer);
-	}
-}
-
-
-
-playersCanSeeEachOthers()
-{
-	for (;;)
-	{
-		// Not enabled, wait
-		if (!level.autoSpectating_do)
-		{
-			wait level.fps_multiplier * 3;
-			continue;
-		}
-
-		players = getentarray("player", "classname");
-		for(i = 0; i < players.size; i++)
-		{
-			player = players[i];
-			player.autospectator_visibleEnemy = undefined;
-			player.autospectator_seenByEnemy = undefined;
-		}
-
-		for(i = 0; i < players.size; i++)
-		{
-			player = players[i];
-
-			if (!isDefined(player)) continue; // because of wait player may be disconnected
-
-			if ((player.pers["team"] == "allies" || player.pers["team"] == "axis") && (player.sessionstate == "playing"))
-			{
-				eye = player maps\mp\gametypes\global\player::getEyeOrigin();
-				angles = player getPlayerAngles();
-
-				for(j = 0; j < players.size; j++)
-				{
-					enemy = players[j];
-
-					if (!isDefined(enemy)) continue; // because of wait player may be disconnected
-
-					if (enemy != player && (enemy.pers["team"] == "allies" || enemy.pers["team"] == "axis") && enemy.pers["team"] != player.pers["team"] && (enemy.sessionstate == "playing"))
-					{
-						angles2 = vectorToAngles(enemy getOrigin() - player getOrigin());
-						angle_diff = angles[1] - angles2[1];
-
-						if (angle_diff > 180) angle_diff -= 360;
-						if (angle_diff < -180) angle_diff += 360;
-
-						//player iprintln("i have player " + enemy.name + " in angle" + angle_diff);
-
-						if (angle_diff > -35 && angle_diff < 35)
-						{
-							trace = Bullettrace(eye, enemy.headTag getOrigin(), true, player);
-							headVisible = isDefined(trace["entity"]) && trace["entity"] == enemy;
-
-							if (headVisible)
-							{
-								//player iprintln("i have players " + enemy.name + " head on screen");
-
-								player.autospectator_visibleEnemy = enemy;
-								enemy.autospectator_seenByEnemy = player;
-
-								continue;
-							}
-						}
-					}
-				}
-
-			}
-
-			wait level.frame;
-		}
-
-		wait level.fps_multiplier * .1;
-	}
-
-}
-
-
-
-playersCloseToEachOther()
-{
-	for (;;)
-	{
-		// Not enabled, wait
-		if (!level.autoSpectating_do)
-		{
-			wait level.fps_multiplier * 3;
-			continue;
-		}
-
-		dist_min = -1;
-		dist_player1 = undefined;
-		dist_player2 = undefined;
-
-		players = getentarray("player", "classname");
-		for(i = 0; i < players.size; i++)
-		{
-			player = players[i];
-
-			player.autoSpectating_veryCloseToEnemy = undefined;
-
-			if ((player.pers["team"] == "allies" || player.pers["team"] == "axis") && (player.sessionstate == "playing"))
-			{
-				for(j = 0; j < players.size; j++)
-				{
-					enemy = players[j];
-
-					if (enemy != player && (enemy.pers["team"] == "allies" || enemy.pers["team"] == "axis") && enemy.pers["team"] != player.pers["team"] && (enemy.sessionstate == "playing"))
-					{
-						dist = distance(player getOrigin(), enemy getOrigin());
-
-						if (dist < dist_min || dist_min == -1)
-						{
-							dist_min = dist;
-							dist_player1 = player;
-							dist_player2 = enemy;
-						}
-					}
-				}
-			}
-		}
-
-		if (dist_min != -1 && dist_min < 800)
-		{
-			dist_player1.autoSpectating_veryCloseToEnemy = dist_player2;
-			dist_player2.autoSpectating_veryCloseToEnemy = dist_player1;
-		}
-
-		wait level.fps_multiplier * .5;
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-autoFollowedPlayer()
-{
-	level.autoSpectating_HUD_text = "STRING_AUTO_SPECTATING";
-
-
-	selectedPlayer = getRecommandedPlayer();
-
-	// For cinematic
-	if (isDefined(selectedPlayer))
-	{
-		level followPlayer(selectedPlayer);
-
-		if (!isDefined(level.in_bash) || !level.in_bash) // ignore cinematic in bash mode
-		{
-			// Do cinematic move for all spectators
-			players = getentarray("player", "classname");
-			for(i = 0; i < players.size; i++)
-			{
-				player = players[i];
-
-				if (player.pers["team"] == "spectator" && player.pers["autoSpectating"])
-					player thread cinematicMove();
-			}
-		}
-
-		level.autoSpectating_noSwitchUntill = gettime() + 12000; // wait some time untill next change
-	}
-
-
-	followed_team_last = "";
-	for(;;)
-	{
-		wait level.fps_multiplier * 0.1;
-
-		players = getentarray("player", "classname");
-
-		// No players, pause loop
-		if (players.size == 0)
-			continue;
-
-		// In timeout
-		if (level.in_readyup)
-			continue;
-
-		canSwitch = (gettime() - level.autoSpectating_noSwitchUntill) > 0;
-
-
-		id = level.autoSpectating_ID;
-		spectated_player = level.autoSpectating_spectatedPlayer;
-
-		if (id == -1 || !isDefined(spectated_player) || !isPlayer(spectated_player))
-		{
-			level followNextPlayer();
-			if (level.debug_spectator) printToAutoSpectators("(no one was followed)");
-			level.autoSpectating_noSwitchUntill = gettime() + 6000; // wait some time untill next change
-			continue;
-		}
-
-		// If followed player is dead, follow next
-		if (spectated_player.sessionstate != "playing")
-		{
-			wait level.fps_multiplier * 1;
-
-			level followNextPlayer();
-			if (level.debug_spectator) printToAutoSpectators("(followed player died)");
-			level.autoSpectating_noSwitchUntill = gettime() + 6000; // wait some time untill next change
-			level.autoSpectating_HUD_text = "STRING_AUTO_SPECTATING";
-			continue;
-		}
-
-		if (!canSwitch)
-		{
-			// Player has visible enemy on their screen or enemy is seeing this player or their screen
-			// Extent time for this player
-			if (isDefined(spectated_player.autospectator_visibleEnemy) || isDefined(spectated_player.autospectator_seenByEnemy))
-			{
-				if (level.debug_spectator) printToAutoSpectators("Extending time for this player (visisble enemy)");
-				level.autoSpectating_noSwitchUntill = gettime() + 8000;
-				level.autoSpectating_HUD_text = "STRING_AUTO_SPECTATING_REASON_VISIBLE_ENEMY";
-				wait level.fps_multiplier * 1;
-			}
-
-			// Dont continue untill we can switch
-			continue;
-		}
-
-		// Count numbers of players in teams
-		alliesAlive = 0;
-		axisAlive = 0;
-		teamPlayersCount = 0;
-		for(i = 0; i < players.size; i++)
-		{
-			player = players[i];
-			if ((player.pers["team"] == "allies" || player.pers["team"] == "axis"))
-			{
-				// Count alive players
-				if (player.sessionstate == "playing" || player.sessionstate == "dead") // dead players are players in spectator session state
-				{
-					if (player.pers["team"] == "allies")
-						alliesAlive++;
-					else
-						axisAlive++;
-				}
-				teamPlayersCount++;
-			}
-		}
-		// If it is 2v2 match or more
-		if (teamPlayersCount >= 4)
-		{
-			follow_team = "";
-			switch_reason = "";
-			hud_text = "";
-
-			// 1vX - always folow alone player
-			if (alliesAlive == 1 && axisAlive > 1)
-			{
-				follow_team = "allies";
-				switch_reason = "Last player in team";
-				hud_text = "STRING_AUTO_SPECTATING_REASON_LAST_PLAYER";
-			}
-
-			// 1vX - always folow alone player
-			else if (axisAlive == 1 && alliesAlive > 1)
-			{
-				follow_team = "axis";
-				switch_reason = "Last player in team";
-				hud_text = "STRING_AUTO_SPECTATING_REASON_LAST_PLAYER";
-			}
-
-			// 1v1 - follow player with lower team score
-			else if (alliesAlive == 1 && axisAlive == 1 && game["allies_score"] != game["axis_score"])
-			{
-				// if my team score is lower then enemy team
-				if (game["allies_score"] < game["axis_score"])
-					follow_team = "allies";
-				else
-					follow_team = "axis";
-
-				switch_reason = "1v1 and lower score";
-				hud_text = "STRING_AUTO_SPECTATING_REASON_1V1_SCORE";
-			}
-
-			if (follow_team != "")
-			{
-				for(i = 0; i < players.size; i++)
-				{
-					player = players[i];
-					if (player.pers["team"] == follow_team && (player.sessionstate == "playing" || player.sessionstate == "dead"))
-					{
-						level followPlayer(player);
-						if (level.debug_spectator) printToAutoSpectators(switch_reason);
-						level.autoSpectating_noSwitchUntill = gettime() + 1000; // wait some time untill next change
-						level.autoSpectating_HUD_text = hud_text;
-						break;
-					}
-				}
-				continue;
-			}
-		}
-
-
-
-		// By default, follow one team
-		followed_team = spectated_player.pers["team"];
-
-		// When bomb is planted, follow team with lower score
-		if (level.gametype == "sd" && level.bombplanted && alliesAlive >= 1 && axisAlive >= 1)
-		{
-			if ((gettime() - level.bombtimerstart) < 3000) // if no action, follow player who actually planted the bomb
-			{
-				if (isDefined(level.planting_player) && isAlive(level.planting_player)) // always follow planter when bomb is planted
-				{
-					level followPlayer(level.planting_player);
-					if (level.debug_spectator) printToAutoSpectators("Bomb planted, following planter");
-					level.autoSpectating_noSwitchUntill = gettime() + 4000; // wait some time untill next change
-					level.autoSpectating_HUD_text = "STRING_AUTO_SPECTATING_REASON_BOMB_PLANTED";
-					continue;
-				}
-			}
-			else
-			{
-				if (game["allies_score"] < game["axis_score"])		followed_team = "allies";
-       			 	else if (game["allies_score"] > game["axis_score"])	followed_team = "axis";
-       			 	if (level.debug_spectator && followed_team != followed_team_last) printToAutoSpectators("bomb planted, following lower score team:" + followed_team);
-				level.autoSpectating_HUD_text = "STRING_AUTO_SPECTATING_REASON_BOMB_SCORE";
-			}
-		}
-
-		// In HQ, follow team that is defending the hq
-		if (level.gametype == "hq" && (level.DefendingRadioTeam == "allies" || level.DefendingRadioTeam == "axis"))
-		{
-			followed_team = level.DefendingRadioTeam;
-			if (level.debug_spectator && followed_team != followed_team_last) printToAutoSpectators("following defending radio team: " + followed_team);
-			level.autoSpectating_HUD_text = "STRING_AUTO_SPECTATING_REASON_RADIO_DEFEND";
-		}
-
-		followed_team_last = followed_team;
-
-
-
-		// Possible to change to player from same spectated team
-		follow = false;
-		switch_reason = "";
-		hud_text = "";
-		for(i = 0; i < players.size; i++)
-		{
-			player = players[i];
-			if ((player.pers["team"] == followed_team))
-			{
-				// Player has visible enemy on their screen
-				if (isDefined(player.autospectator_visibleEnemy))
-				{
-					follow = true;
-					switch_reason = "Visible enemy on screen";
-					hud_text = "STRING_AUTO_SPECTATING_REASON_VISIBLE_ENEMY";
-				}
-
-				// Too long no change, find players very close together to follow
-				if ((gettime() - level.autoSpectating_lastChange) > 16000)
-				{
-					// Enemy is seeing this player or their screen
-					if (isDefined(player.autospectator_seenByEnemy))
-					{
-						follow = true;
-						switch_reason = "Is visible on enemy screen";
-						hud_text = "STRING_AUTO_SPECTATING_REASON_VISIBLE_BY_ENEMY";
-					}
-					// Player very close to each other (< 800)
-					else if (isDefined(player.autoSpectating_veryCloseToEnemy) && spectated_player != player)
-					{
-						follow = true;
-						switch_reason = "No action - close enemy near by";
-						hud_text = "STRING_AUTO_SPECTATING_REASON_NO_ACTION_NEARBY";
-					}
-					else if (player.isMoving)
-					{
-						follow = true;
-						switch_reason = "No action - moving player";
-						hud_text = "STRING_AUTO_SPECTATING_REASON_NO_ACTION_MOVING";
-					}
-				}
-
-				if (follow)
-				{
-					level followPlayer(player);
-
-					if (level.debug_spectator) printToAutoSpectators(switch_reason);
-
-					level.autoSpectating_noSwitchUntill = gettime() + 8000;
-
-					level.autoSpectating_HUD_text = hud_text;
-
-					break;
-				}
-			}
-		}
-
-
-
-
-
-
-	}
-}
diff --git a/source/maps/mp/gametypes/_spectating_hud.gsc b/source/maps/mp/gametypes/_spectating_hud.gsc
deleted file mode 100644
index e108ba7..0000000
--- a/source/maps/mp/gametypes/_spectating_hud.gsc
+++ /dev/null
@@ -1,343 +0,0 @@
-#include maps\mp\gametypes\global\_global;
-
-init()
-{
-	addEventListener("onConnected",  ::onConnected);
-
-	if (!level.spectatingSystem)
-		return;
-
-	if(game["firstInit"])
-	{
-		precacheString2("STRING_AUTO_SPECTATOR_KEY", &"Press ^3[{+melee_breath}]^7 to disable auto-spectator\nHold ^3[{+attack}]^7 to enable auto-spectator\nPress ^3[{+activate}]^7 to play killcam\nHold ^3[{+activate}]^7 to toggle XRAY");
-	}
-
-	addEventListener("onSpawnedSpectator",  ::onSpawnedSpectator);
-}
-
-onConnected()
-{
-	self endon("disconnect");
-
-	// Hide all HUD from previous map
-	if (!level.spectatingSystem || level.in_readyup || self.pers["team"] != "spectator")
-	{
-		wait level.frame; // for optimalization - send in different frame
-		HUD_hideUI();
-	}
-}
-
-onSpawnedSpectator()
-{
-	if (self.pers["team"] == "spectator" && !level.in_readyup)
-	{
-		// Create and update boxes with players name
-		self thread filling_boxes();
-	}
-}
-
-
-
-
-
-
-keys_help()
-{
-	self endon("disconnect");
-
-	self thread keys_show();
-
-	wait level.fps_multiplier * 5;
-
-	self thread keys_hide();
-}
-
-keys_show()
-{
-	if(!isdefined(self.autoSpectatingKeyInfoBG))
-	{
-		self.autoSpectatingKeyInfoBG = newClientHudElem2(self);
-		self.autoSpectatingKeyInfoBG.archived = false;
-		self.autoSpectatingKeyInfoBG.x = -170;
-		self.autoSpectatingKeyInfoBG.y = 55;
-		self.autoSpectatingKeyInfoBG.horzAlign = "right";
-		self.autoSpectatingKeyInfoBG.vertAlign = "top";
-		self.autoSpectatingKeyInfoBG.alpha = 0.8;
-		self.autoSpectatingKeyInfoBG.sort = -1;
-		self.autoSpectatingKeyInfoBG setShader("black", 160, 42);
-	}
-	if(!isdefined(self.autoSpectatingKeyInfo))
-	{
-		self.autoSpectatingKeyInfo = addHUDClient(self, -164, 60, 0.7, (1,1,1), "left", "top", "right", "top");
-		self.autoSpectatingKeyInfo.archived = false;
-		self.autoSpectatingKeyInfo setText(game["STRING_AUTO_SPECTATOR_KEY"]);
-	}
-}
-
-keys_hide()
-{
-	self endon("disconnect");
-
-	time = 0.3;
-
-	if(isDefined(self.autoSpectatingKeyInfoBG))
-	{
-		self.autoSpectatingKeyInfoBG fadeOverTime(time);
-		self.autoSpectatingKeyInfoBG.alpha = 0;
-	}
-	if(isDefined(self.autoSpectatingKeyInfo))
-	{
-		self.autoSpectatingKeyInfo fadeOverTime(time);
-		self.autoSpectatingKeyInfo.alpha = 0;
-	}
-
-	wait level.fps_multiplier * time;
-
-	if(isdefined(self.autoSpectatingKeyInfoBG))
-	{
-		self.autoSpectatingKeyInfoBG destroy2();
-		self.autoSpectatingKeyInfoBG = undefined;
-	}
-	if(isdefined(self.autoSpectatingKeyInfo))
-	{
-		self.autoSpectatingKeyInfo destroy2();
-		self.autoSpectatingKeyInfo = undefined;
-	}
-}
-
-
-
-
-
-
-HUD_hideUI()
-{
-
-	setClientCvarIfChanged("ui_spectatingsystem_team1_sideColor", 	"");
-	setClientCvarIfChanged("ui_spectatingsystem_team1_name", 	"");
-	setClientCvarIfChanged("ui_spectatingsystem_team1_scoreProgress", "");
-
-	setClientCvarIfChanged("ui_spectatingsystem_team2_sideColor", 	"");
-	setClientCvarIfChanged("ui_spectatingsystem_team2_name", 	"");
-	setClientCvarIfChanged("ui_spectatingsystem_team2_scoreProgress", "");
-
-	setClientCvarIfChanged("ui_spectatingsystem_playerProgress", "");
-
-	for (i = 0; i < 5; i++)
-	{
-		setClientCvarIfChanged("ui_spectatingsystem_team1_player"+i+"_health", "");
-		setClientCvarIfChanged("ui_spectatingsystem_team1_player"+i+"_text", "");
-		setClientCvarIfChanged("ui_spectatingsystem_team2_player"+i+"_health", "");
-		setClientCvarIfChanged("ui_spectatingsystem_team2_player"+i+"_text", "");
-	}
-
-}
-
-
-filling_boxes()
-{
-	self endon("disconnect");
-
-	wait level.frame;
-
-	teamLeft = "allies";
-	teamRight = "axis";
-
-	// If match info is enabled, ensure teams are in correct sides
-	if (game["scr_matchinfo"] == 1 || game["scr_matchinfo"] == 2)
-	{
-		if (game["match_team1_side"] == "axis")
-		{
-			teamLeft = "axis";
-			teamRight = "allies";
-		}
-	}
-
-
-	for(;;)
-	{
-		wait level.fps_multiplier * 0.1;
-
-		if (self.pers["team"] == "spectator")
-		{
-			// Hide for a while
-			if (isDefined(self.killcam) || level.in_readyup) // readyup in case timeout is called
-			{
-				HUD_hideUI();
-				continue;
-			}
-
-
-			scoreProgress = "";
-			if (isDefined(game["allies_score_history"]) && isDefined(game["axis_score_history"]) && game["allies_score_history"] != "" && game["axis_score_history"] != "")
-			{
-				scoreProgress = "Team 1: ";
-				if (teamLeft == "axis") scoreProgress += game["axis_score_history"];
-				else scoreProgress += game["allies_score_history"];
-			}
-			setClientCvarIfChanged("ui_spectatingsystem_team1_scoreProgress", scoreProgress);
-
-			scoreProgress = "";
-			if (isDefined(game["allies_score_history"]) && isDefined(game["axis_score_history"]) && game["allies_score_history"] != "" && game["axis_score_history"] != "")
-			{
-				scoreProgress = "Team 2: ";
-				if (teamRight == "axis") scoreProgress += game["axis_score_history"];
-				else scoreProgress += game["allies_score_history"];
-			}
-
-			setClientCvarIfChanged("ui_spectatingsystem_team2_scoreProgress", scoreProgress);
-
-
-
-
-			playerProgress = "";
-			if (level.gametype == "sd" && isDefined(level.player_alive_history) && level.player_alive_history != "")
-				playerProgress = "Players:" + level.player_alive_history;
-
-			setClientCvarIfChanged("ui_spectatingsystem_playerProgress", playerProgress);
-
-
-
-
-
-			playersLeft = getPlayersSortedByScore(teamLeft);
-			playersRight = getPlayersSortedByScore(teamRight);
-
-			// Fill bars
-			for(r = 0; r < 5; r++)
-			{
-				if (r < playersLeft.size)
-					self fill_box(r, "left", teamLeft, playersLeft[r]);
-				else
-					self unfill_box(r, "left");
-
-				if (r < playersRight.size)
-					self fill_box(r, "right", teamRight, playersRight[r]);
-				else
-					self unfill_box(r, "right");
-			}
-
-		}
-		else
-		{
-			// Player left spectators
-			// Hide hud elements
-			HUD_hideUI();
-			return;
-		}
-	}
-}
-
-getPlayersSortedByScore(teamname)
-{
-	playersFiltered = [];
-	index = 0;
-	players = getentarray("player", "classname");
-	for(i = 0; i < players.size; i++)
-	{
-		player = players[i];
-
-		if (!isDefined(teamname) || player.pers["team"] == teamname)
-		{
-			playersFiltered[index] = player;
-			index++;
-		}
-	}
-
-	sorted = sort(playersFiltered);
-
-	// Sort and return
-	return sorted;
-}
-
-sort(players)
-{
-	// Sort score from highest to Vlowest
-	for(j = 1; j < players.size; j++)
-	{
-		for (
-			jj = j;
-			jj >= 1 && (
-				(players[jj-1].score < players[jj].score) ||
-				(players[jj-1].score == players[jj].score && players[jj-1].deaths > players[jj].deaths)
-			);
-			jj--)
-		{
-			temp = players[jj];
-			players[jj] = players[jj-1];
-			players[jj-1] = temp;
-		}
-	}
-	return players;
-}
-
-
-
-fill_box(index, barSide, teamname, player)
-{
-	teamNum = "1";
-	if (barSide == "right")
-		teamNum = "2";
-
-	value = "";
-	// Because health is showed via menu elements, the health bar is splited only into a few sizes
-	// So according to helth we select most corresponding size
-	if (player.health <= 0)
-		value =  "0";
-
-	else if (player.health < 20)
-		value =  "10";
-
-	else if (player.health < 70)
-		value =  "50";
-
-	else if (player.health < 99)
-		value =  "80";
-
-	else
-		value =  "100";
-
-
-	if (player.health > 0)
-	{
-	      	if (teamname == "allies")
-		{
-			if(game["allies"] == "american")
-				value = value + "_green";
-			else if(game["allies"] == "british")
-				value = value + "_blue";
-			else if(game["allies"] == "russian")
-				value = value + "_red";
-		}
-		else
-			value = value + "_gray";
-	}
-
-
-	if (self.pers["autoSpectating"] && isDefined(level.autoSpectating_spectatedPlayer) && player == level.autoSpectating_spectatedPlayer)
-	{
-		value = value + "_"; // underscore means this player is followed and rectangle next player box is showed
-	}
-
-	setClientCvarIfChanged("ui_spectatingsystem_team"+teamNum+"_player"+index+"_health", value);
-
-
-
-	teamNum = "1";
-	if (barSide == "right")
-		teamNum = "2";
-	setClientCvarIfChanged("ui_spectatingsystem_team"+teamNum+"_player"+index+"_text", player.score + " / " + player.deaths + "    " + player.name);
-}
-
-
-unfill_box(index, barSide)
-{
-	teamNum = "1";
-	if (barSide == "right")
-		teamNum = "2";
-
-	// Text does not need to be updated, because is hided automatically if healht is empty
-	//setClientCvarIfChanged("ui_spectatingsystem_team"+teamNum+"_player"+index+"_text", "");
-
-	setClientCvarIfChanged("ui_spectatingsystem_team"+teamNum+"_player"+index+"_health", "");
-}
diff --git a/source/maps/mp/gametypes/_spectating_hud_esp.gsc b/source/maps/mp/gametypes/_spectating_hud_esp.gsc
deleted file mode 100644
index 3eb3075..0000000
--- a/source/maps/mp/gametypes/_spectating_hud_esp.gsc
+++ /dev/null
@@ -1,424 +0,0 @@
-#include maps\mp\gametypes\global\_global;
-
-init()
-{
-	if (!level.spectatingSystem)
-		return;
-
-	if(game["firstInit"])
-	{
-		precacheShader("stance_stand_front");
-		precacheShader("stance_stand_back");
-		precacheShader("stance_stand_left");
-		precacheShader("stance_stand_right");
-		precacheShader("stance_crouch_front");
-		precacheShader("stance_crouch_back");
-		precacheShader("stance_crouch_left");
-		precacheShader("stance_crouch_right");
-		precacheShader("stance_prone_front");
-		precacheShader("stance_prone_back");
-		precacheShader("stance_prone_left");
-		precacheShader("stance_prone_right");
-	}
-
-	addEventListener("onConnected",  ::onConnected);
-}
-
-onConnected()
-{
-	if (!isDefined(self.pers["autoSpectatingESP"]))
-		self.pers["autoSpectatingESP"] = true;
-}
-
-
-
-ESP_Destroy()
-{
-	// Destroy all
-	for(i = 0; i < self.spec_ESP_names.size; i++)
-	{
-		// If HUD is not defined, it means player disconnect and HUD object was deleted
-		if (isDefined(self.spec_ESP_names[i]))
-			self.spec_ESP_names[i] destroy2();
-		if (isDefined(self.spec_ESP_images[i]))
-			self.spec_ESP_images[i] destroy2();
-	}
-	self.spec_ESP_names = undefined;
-	self.spec_ESP_images = undefined;
-
-	if (level.debug_spectator) self iprintln("autospec> ESP HUD destroyed ^1ALL");
-}
-
-/*
-self is spectater
-*/
-ESP_Loop()
-{
-	self endon("disconnect");
-
-	if (isDefined(self.spec_ESP_names))
-		self ESP_Destroy();
-	self.spec_ESP_names = [];
-	self.spec_ESP_images = [];
-
-	self thread FollowCloseByPlayer();
-
-	spectator = self;
-	i_ESP = 0;
-
-	for(;;)
-	{
-		// Clear unused HUD elements
-		for (i = self.spec_ESP_names.size - 1; i >= i_ESP; i--)
-		{
-			// If HUD is not defined, it means player disconnect and HUD object was deleted
-			if (isDefined(self.spec_ESP_names[i]))
-				self.spec_ESP_names[i] destroy2();
-			if (isDefined(self.spec_ESP_images[i]))
-				self.spec_ESP_images[i] destroy2();
-
-			self.spec_ESP_names[i] = undefined;
-			self.spec_ESP_images[i] = undefined;
-
-			if (level.debug_spectator) self iprintln("autospec> ESP HUD destroyed index " + i);
-		}
-
-		wait level.frame;
-
-		i_ESP = 0;
-
-		// Player disconnects
-		if (!isDefined(self))
-			break;
-		// Variables destroyed (not likely)
-		if (!isDefined(self.spec_ESP_names) || !isDefined(self.spec_ESP_images))
-			break;
-		// All needs to be removed (changed team )
-		if (self.pers["team"] != "spectator")
-			break;
-		// Hide hud in Readyup or bash
-		if (level.in_readyup || level.in_bash)
-			continue;
-		// Dont show ESP if killcam or its turned off
-		if (isDefined(spectator.killcam) || !spectator.pers["autoSpectatingESP"])
-			continue;
-
-		// Get spectated player
-		autospectated_player = undefined;
-		if (spectator.pers["autoSpectating"] && isDefined(level.autoSpectating_spectatedPlayer))
-			autospectated_player = level.autoSpectating_spectatedPlayer;
-
-		// Spectating player but not via auto-spectator
-		if (!isDefined(autospectated_player) && !spectator.freeSpectating)
-			continue;
-
-
-		// Find players that will be showed via ESP
-		players = getentarray("player", "classname");
-		for(i = 0; i < players.size; i++)
-		{
-			player = players[i];
-			if (player == spectator || !(player.pers["team"] == "allies" || player.pers["team"] == "axis"))
-				continue;
-			if (player.sessionstate != "playing" && player.sessionstate != "dead")
-				continue;
-
-			// Skip spectated player
-			if (isDefined(autospectated_player) && player == autospectated_player)
-				continue;
-
-			// When auto-spectating (not flying) and followed player died, hide all (because game does not provide correct angles in this session state)
-			if (isDefined(autospectated_player) && autospectated_player.sessionstate != "playing")
-				continue;
-
-			// When auto-spectating show only enemy (except for DM where show all players)
-			// When free-flying show all players
-			if (isDefined(autospectated_player) && autospectated_player.sessionteam == player.sessionteam && player.sessionteam != "none")
-				continue;
-
-
-			// Create new HUD element
-			isNew = false;
-			if (!isDefined(self.spec_ESP_names[i_ESP]))
-			{
-				self.spec_ESP_names[i_ESP] = addHUDClient(self, 10, 10, 1.2, (1,1,1), "center", "bottom", "subleft", "subtop");
-				self.spec_ESP_names[i_ESP].name = "name";
-				self.spec_ESP_names[i_ESP].fontscale = 0.8;
-				self.spec_ESP_names[i_ESP].archived = false;
-
-				self.spec_ESP_images[i_ESP] = addHUDClient(self, 10, 10, 1.2, (1,1,1), "center", "bottom", "subleft", "subtop");
-				self.spec_ESP_images[i_ESP].name = "layout";
-				self.spec_ESP_images[i_ESP].archived = false;
-				self.spec_ESP_images[i_ESP].sort = -1;
-
-				isNew = true;
-
-				if (level.debug_spectator) self iprintln("autospec> ESP HUD added NEW index " + i_ESP);
-			}
-
-			// Update HUD
-			if (isNew || self.spec_ESP_names[i_ESP].player != player)
-			{
-				self.spec_ESP_names[i_ESP].player = player;
-				self.spec_ESP_names[i_ESP].offset = (0, 0, 25);
-				self.spec_ESP_names[i_ESP].tag = "head";
-				self.spec_ESP_names[i_ESP] SetPlayerNameString(player);
-				self.spec_ESP_names[i_ESP] thread SetPlayerWaypoint(self, player);
-				self.spec_ESP_names[i_ESP] thread hud_waypoint_animate(self, player);
-
-				self.spec_ESP_images[i_ESP].player = player;
-				self.spec_ESP_images[i_ESP].offset = (0, 0, -15);
-				self.spec_ESP_images[i_ESP] thread SetPlayerWaypoint(self, player);
-				self.spec_ESP_images[i_ESP] thread hud_waypoint_animate(self, player);
-			}
-
-			i_ESP++;
-		}
-	}
-
-	// Destroy HUD (unles player disconnects)
-	if (isDefined(self))
-		self ESP_Destroy();
-}
-
-
-/*
-When free-flying check for close-by player according to ESP names
-*/
-FollowCloseByPlayer()
-{
-	self endon("disconnect");
-
-	self.spec_follow_text = addHUDClient(self, 0, 50, 1.2, (1,1,1), "center", "top", "center", "top");
-	self.spec_follow_text.alpha = 0;
-
-	saved_player_last = undefined;
-
-	for(;;)
-	{
-		wait level.frame;
-
-		// All needs to be removed (changed team or timeout is called)
-		if (!isDefined(self) || self.pers["team"] != "spectator" || level.in_readyup)
-			break;
-
-		if (!self.freeSpectating)
-			continue;
-
-		saved_dist2D = 0;
-		saved_dist3D = 0;
-		saved_player = undefined;
-
-		for(i = 0; i < self.spec_ESP_names.size; i++)
-		{
-			hud = self.spec_ESP_names[i];
-
-			// If HUD is not defined, it means player disconnect and HUD object was deleted
-			if (!isDefined(hud) || !isDefined(hud.player) || !isAlive(hud.player))
-				continue;
-
-			// Find out looking at player to follow on click
-			dist3D = distance(self.origin, hud.player.origin);
-
-			// If text is somewhere in rectangle around center
-			if ((hud.x > 160 && hud.x < 480 && hud.y > 120 && hud.y < 360) || (dist3D < 300 && hud.x > 160 && hud.x < 480))
-			{
-				if (dist3D < 1000)
-				{
-					dist2D = distance((hud.x, hud.y, 0), (320, 240, 0));	// Distance of text from center - text is in 640x480 rectangle aligned left top
-
-					if (!isDefined(saved_player) || (dist2D < saved_dist2D && dist3D < saved_dist3D))
-					{
-						saved_dist2D = dist2D;
-						saved_dist3D = dist3D;
-						saved_player = hud.player;
-					}
-				}
-			}
-		}
-
-		time = 0.1;
-
-		if (isDefined(saved_player))
-		{
-			if (isDefined(saved_player_last) && saved_player_last != saved_player)
-			{
-				self.spec_follow_text fadeOverTime(time);
-				self.spec_follow_text.alpha = 0;
-				wait level.fps_multiplier * time;
-				if (!isDefined(self)) break; // in case player disconnects
-			}
-			if (!isDefined(saved_player_last) || saved_player_last != saved_player)
-			{
-				self.spec_follow_text SetPlayerNameString(saved_player);
-				self.spec_follow_text fadeOverTime(time);
-				self.spec_follow_text.alpha = 1;
-				wait level.fps_multiplier * time;
-				if (!isDefined(self)) break; // in case player disconnects
-			}
-		}
-		else if (isDefined(saved_player_last))
-		{
-			self.spec_follow_text fadeOverTime(time);
-			self.spec_follow_text.alpha = 0;
-			wait level.fps_multiplier * time;
-			if (!isDefined(self)) break; // in case player disconnects
-		}
-
-		saved_player_last = saved_player;
-
-		self.spec_follow = saved_player;
-	}
-
-	self.spec_follow_text destroy2();
-}
-
-
-
-
-// self is HUD, spectator is hud owner and player is waypoined player
-hud_waypoint_animate(spectator, player)
-{
-	// Make sure only 1 thread is running on this HUD element
-	self notify("hud_waypoint_animate");
-	self endon("hud_waypoint_animate");
-
-	alpha_old = 0;
-	alpha_cnt = 0;
-	alpha_last = 0;
-	self.alpha = 0;
-
-	for (;;)
-	{
-		wait level.frame;
-
-		if (!isDefined(self) || !isDefined(spectator) || !isDefined(player))
-			break;
-
-		// Get spectated player
-		spectated_player = spectator;
-		if (!isDefined(spectator.killcam) && spectator.pers["autoSpectating"] && isDefined(level.autoSpectating_spectatedPlayer))
-			spectated_player = level.autoSpectating_spectatedPlayer;
-
-
-		alpha = 0.0;
-		if (isAlive(player))
-		{
-			// Player is far way
-			dist = distance(spectated_player.origin, player.origin);
-
-			if (self.name == "name")
-			{
-				// Hide name if player is too far
-				if (dist < 1500 || spectator.freeSpectating)
-					alpha = 1;
-			}
-
-			if (self.name == "layout")
-			{
-				// Hide player icon when player is visible
-				if (!spectated_player isPlayerInSight(player))
-					alpha = 0.25;
-			}
-
-			// Hide if mouse is over
-			if (!spectator.freeSpectating)
-			{
-				// If is in center, add alpha
-				dist2D = distance((self.x, self.y, 0), (320, 240, 0));	// Distance of text from center - text is in 640x480 rectangle aligned left top
-				if (dist2D <= 25)
-					alpha = 0.0;
-				else if (dist2D > 25 && dist2D <= 150)
-					alpha = alpha * ((dist2D-25) / 125);
-			}
-		}
-
-		// Alpha smooth animation
-		if (alpha_last != alpha)
-		{
-			alpha_old = self.alpha;
-			alpha_cnt = 10;
-			alpha_last = alpha;
-		}
-		if (alpha_cnt > 0)
-		{
-			self.alpha = alpha_old + ((alpha - alpha_old) / 10) * (10-alpha_cnt);
-			alpha_cnt--;
-		}
-		else
-			self.alpha = alpha;
-
-
-		// Item is not visible, no need to continue animation
-		if (self.alpha == 0)
-			continue;
-
-
-		if (self.name == "name")
-		{
-			color = (0.8, 0.8, 0.8);
-			if (player.pers["team"] == "allies")
-			{
-				if(game["allies"] == "american")
-					color = (0.4, 0.9, .56);
-				else if(game["allies"] == "british")
-					color = (0.45, 0.73, 1);
-				else if(game["allies"] == "russian")
-					color = (1, 0.4, 0.4);
-			}
-			self.color = color;
-		}
-
-
-		if (self.name == "layout")
-		{
-			stance = player maps\mp\gametypes\global\player::getStance(); // prone crouch stand
-
-			angles = player getPlayerAngles();
-
-			diff = (player.origin - spectated_player.origin);
-			diff = (diff[0], diff[1], 0);
-			diff = vectortoangles(diff);
-
-			angle = (angles[1] - diff[1]);
-
-			if (angle > 180)	angle -= 360;
-			else if (angle < -180)	angle += 360;
-			angle += 180; // flip direction, now in range 0 <-> 360
-			if (angle > 180) angle -= 360; // back to range -180 <-> +180
-
-
-			if ((angle > 135 && angle <= 180) || (angle < -135 && angle >= -180))
-				self.shader = "stance_" + stance + "_back";
-			else if (angle > 45 && angle < 135)
-				self.shader = "stance_" + stance + "_right";
-			else if (angle < -45 && angle > -135)
-				self.shader = "stance_" + stance + "_left";
-			else
-				self.shader = "stance_" + stance + "_front";
-
-			self.w = 25;
-			self.h = 25;
-			self.scale = 1400;
-
-			color = (0.9, 0.9, 0.9);
-			if (player.pers["team"] == "allies")
-			{
-				if(game["allies"] == "american")
-					color = (0.7, 0.95, .8);
-				else if(game["allies"] == "british")
-					color = (0.73, 0.86, 1);
-				else if(game["allies"] == "russian")
-					color = (1, 0.7, 0.7);
-			}
-			if (player.health <= 0)
-				color = (1, 0, 0); // red
-			else if (player.health < 100)
-			{
-				dmg = (player.health / 100);
-				color = (color[0] + (1-color[0]) * (1-dmg), color[1] * dmg, color[2] * dmg);
-			}
-			self.color = color;
-		}
-	}
-}
diff --git a/source/maps/mp/gametypes/_spectating_system.gsc b/source/maps/mp/gametypes/_spectating_system.gsc
new file mode 100644
index 0000000..e786e7f
--- /dev/null
+++ b/source/maps/mp/gametypes/_spectating_system.gsc
@@ -0,0 +1,1446 @@
+#include maps\mp\gametypes\global\_global;
+
+init()
+{
+	level.spectatingSystem_playerID = -1;		// spectated player
+	level.spectatingSystem_player = undefined;
+	level.spectatingSystem_lastChange = 0;
+
+	if (!isDefined(game["spectatingSystem_recommandedPlayerMode_teamLeft_player"]) || level.gametype != "sd" || game["round"] == 0) // round in case of bash
+		game["spectatingSystem_recommandedPlayerMode_teamLeft_player"] = undefined;
+	if (!isDefined(game["spectatingSystem_recommandedPlayerMode_teamRight_player"]) || level.gametype != "sd" || game["round"] == 0) // round in case of bash
+		game["spectatingSystem_recommandedPlayerMode_teamRight_player"] = undefined;
+
+
+	addEventListener("onConnected",  	::onConnected);
+	addEventListener("onSpawnedPlayer",  	::onSpawnedPlayer);
+	addEventListener("onSpawnedSpectator",  ::onSpawnedSpectator);
+
+	if (!level.spectatingSystem)
+	{
+		return;
+	}
+
+	addEventListener("onSpawnedStreamer",  ::onSpawnedStreamer);
+	addEventListener("onConnectedAll",    	::onConnectedAll);
+	addEventListener("onMenuResponse",  	::onMenuResponse);
+
+	//setCvar("debug_spectator", 1);
+}
+
+// Called even is spectating system is disabled
+onConnected()
+{
+	self endon("disconnect");
+
+	if (!isDefined(self.pers["spectatingSystem_menu_opened"]))
+		self.pers["spectatingSystem_menu_opened"] = false;
+
+	if (!isDefined(self.pers["spectatingSystem_menu_open_confirmed"]))
+		self.pers["spectatingSystem_menu_open_confirmed"] = false;
+
+	if (!isDefined(self.pers["spectatingSystem_keysConfirmed"]))
+		self.pers["spectatingSystem_keysConfirmed"] = false;
+
+	if (!isDefined(self.pers["spectatingSystem_autoJoinSpectatorTeam"]))
+		self.pers["spectatingSystem_autoJoinSpectatorTeam"] = false;
+
+
+	self.spectatingSystem_turnedOn = false;		// menu is opened
+	self.spectatingSystem_freeSpectating = true; 	// free spectating, not following any player
+	self.spectatingSystem_inCinematic = false;
+
+	// Switched to readyup (halft, timeout..) -> imidietly hide bars
+	if (level.spectatingSystem && level.in_readyup)
+	{
+		wait level.fps_multiplier * 0.41337;
+		self thread maps\mp\gametypes\_spectating_system_hud::hide_player_boxes();
+	}
+}
+
+onConnectedAll()
+{
+	level thread spectating_loop();
+}
+
+// Called even is spectating system is disabled
+onSpawnedPlayer()
+{
+	self exit();
+}
+
+// Called even is spectating system is disabled
+onSpawnedSpectator()
+{
+	self exit();
+}
+
+
+onSpawnedStreamer()
+{
+	self endon("disconnect");
+
+	if (self.pers["team"] == "streamer")
+	{
+		// Open menu
+		if (level.in_readyup)
+			self thread openSpectMenu(false); // without cursor
+		else
+			self thread openSpectMenu(true); // with cursor
+
+
+		// Watch for keys and force following a player
+		self thread player_loop();
+		self spectatingSystemTurnOn();
+
+		// Show autospectator status HUD
+		self thread maps\mp\gametypes\_spectating_system_auto::HUD_loop();
+		// Create and update boxes with players name
+		self thread maps\mp\gametypes\_spectating_system_hud::HUD_PlayerBoxes_Loop();
+		// XRAY
+		self thread maps\mp\gametypes\_spectating_system_xray::XRAY_Loop();
+
+		self thread cinematicMove();
+	}
+}
+
+
+
+
+exit()
+{
+	// We have to make sure that this cvar is defined, otherwise quickmessages menu will not work
+	self setClientCvar2("ui_quickmessage_spectatormode", "0");
+
+	// Disable auto spectator team join
+	self join_spectator_disable();
+
+	// Hide black background for animation
+	if (isDefined(self.spectator_blackbg))
+	{
+		self.spectator_blackbg destroy2();
+		self.spectator_blackbg = undefined;
+	}
+}
+
+
+join_spectator_isEnabled()
+{
+	return self.pers["spectatingSystem_autoJoinSpectatorTeam"];
+}
+
+// Is called from quicksettings on player connect, after settings are loaded + when player joined streamers and confirmed keys
+join_spectator_enable(loaded_from_settings)
+{
+	if (!isDefined(loaded_from_settings)) loaded_from_settings = false;
+
+	// Conditions to apply		(in server info)				(waiting for key confirm)
+	if (level.spectatingSystem && (!isDefined(self.pers["firstTeamSelected"]) || self.pers["team"] == "streamer") && self.pers["spectatingSystem_autoJoinSpectatorTeam"] == false)
+	{
+		self.pers["spectatingSystem_autoJoinSpectatorTeam"] = true;
+		//self iprintln("Automatically join spectator team ^2Enabled");
+
+		// Enabled when manually joined streamers, save this setting into server16
+		if (loaded_from_settings == false)
+			self maps\mp\gametypes\_quicksettings::updateClientSettings("streamer_enabled");
+
+		// Loaded from settings, move to streamer team
+		if (loaded_from_settings && !isDefined(self.pers["firstTeamSelected"]))
+		{
+			self thread move_to_streamers();
+		}
+	}
+}
+
+// Is called from quicksettings on player connect, after settings are loaded + when player exit streamers team
+join_spectator_disable(loaded_from_settings)
+{
+	if (!isDefined(loaded_from_settings)) loaded_from_settings = false;
+
+	//if (self.pers["spectatingSystem_autoJoinSpectatorTeam"])
+		//self iprintln("Automatically join spectator team ^1Disabled");
+
+	self.pers["spectatingSystem_autoJoinSpectatorTeam"] = false;
+
+	// Save this setting into server16
+	if (loaded_from_settings == false)
+		self maps\mp\gametypes\_quicksettings::updateClientSettings("streamer_disabled");
+}
+
+
+join_spectator_toggle()
+{
+	if (self join_spectator_isEnabled())
+		self join_spectator_disable();
+	else
+		self join_spectator_enable();
+}
+
+
+// Called when settings are loaded from serverinfo
+move_to_streamers()
+{
+	self endon("disconnect");
+
+	// Simulate joining streamer team
+	// It needs to be distributed like this because a lot of cvars for scoreboard and spectator bars are beeing sent to players (command overflow fix)
+
+	wait level.fps_multiplier * 0.5;
+
+	// Serverinfo menu close
+	self closeMenu();
+	self closeInGameMenu();
+	self.pers["skipserverinfo"] = true;
+
+	// Streamers have visible scoreboard from previous map (intermission scoreboard)
+	// This will make sure it will be hided
+	self thread maps\mp\gametypes\_menu_scoreboard::hide_scoreboard(true); // true = distributed
+
+	self iprintlnbold("Streamer auto-join...");
+
+	wait level.fps_multiplier * 2;
+
+	self iprintlnbold(" ");
+	self iprintlnbold(" ");
+	self iprintlnbold(" ");
+	self iprintlnbold(" ");
+	self iprintlnbold(" ");
+
+	self notify("menuresponse", game["menu_team"], "streamer");
+	waittillframeend;
+}
+
+
+
+/*
+Called when command scriptmenuresponse is executed on client side
+self is player that called scriptmenuresponse
+Return true to indicate that menu response was handled in this function
+*/
+onMenuResponse(menu, response)
+{
+	if (self.pers["team"] != "streamer")
+		return;
+
+	if (menu == game["menu_spectatingsystem"])
+	{
+		if (response == "menu_open")
+		{
+			self.pers["spectatingSystem_menu_open_confirmed"] = true;
+
+			self thread maps\mp\gametypes\_spectating_system_hud::HUD_ActivateSpectatingSystem_hide();
+
+			// Enable auto spectator team join when keys were confirmed
+			if (join_spectator_isEnabled() == false && self.pers["spectatingSystem_keysConfirmed"])
+				self join_spectator_enable();
+
+			// Automatically confirm keys welcoming message if auto spectator join team is enabled
+			if (self.pers["spectatingSystem_autoJoinSpectatorTeam"])
+				self.pers["spectatingSystem_keysConfirmed"] = true;
+
+			// Show welcoming keys
+			if (self.pers["spectatingSystem_keysConfirmed"] == false)
+			{
+				self thread maps\mp\gametypes\_spectating_system_hud::keys_show();
+				self thread maps\mp\gametypes\_spectating_system_hud::HUD_KeysWelcome_show();
+			}
+
+			// Hide scoreboard from ingame menu
+			self.pers["scoreboard_keepRefreshing"] = 0;
+
+			return true;
+		}
+		else if (response == "menu_close")
+		{
+			self.pers["spectatingSystem_menu_opened"] = false;
+			self thread maps\mp\gametypes\_spectating_system_hud::keys_hide();
+			self thread maps\mp\gametypes\_spectating_system_hud::HUD_ActivateSpectatingSystem_show();
+
+			// Hide scoreboard from ingame menu
+			self.pers["scoreboard_keepRefreshing"] = 0;
+
+			return true;
+		}
+
+		else if (response == "shift")
+		{
+			if (level.debug_spectator) self iprintln("MENU_SHIFT");
+
+			// We were in cinematic move, cancel it
+			if (self.spectatingSystem_inCinematic)
+				self.spectatingSystem_inCinematic = false;
+
+			// Shift is automatically closing the menu to hide cursor
+			self.pers["spectatingSystem_menu_opened"] = false;
+			self thread maps\mp\gametypes\_spectating_system_hud::keys_hide();
+			self thread maps\mp\gametypes\_spectating_system_hud::HUD_ActivateSpectatingSystem_show();
+
+			// In killcam the shift melee key does not work, so we closed the menu but we cannot continue untill killcam ends
+			if (isDefined(self.killcam))
+				return true;
+
+			// Disable spectating system to be able to register player's shift key to stop following player
+			if (self.spectatingSystem_turnedOn)
+			{
+				self spectatingSystemTurnOff();
+				if (level.debug_spectator) self iprintln("MENU_SHIFT> ^1spectating system turned OFF");
+			}
+
+			// Force leaving followed player by simulation SHIFT key press on client
+			// Exec command on client side
+			// If some menu is already opened:
+			//	- by player (main menu / quick messages) -> NOT WORKING - command will not be executed
+			//	- by player (by ESC key) -> that menu will be closed
+			//  	- by script (via openMenu()) -> that menu will be closed and exec_cmd will not be closed correctly
+			//			(mouse will be visible with clear backgorund.... so closeMenu() is called to close that menu)
+			self setClientCvar2("exec_cmd", "+melee; -melee");
+			self openMenu(game["menu_exec_cmd"]);		// open menu via script
+			self closeMenu();				// will only close menu opened by script
+
+			// Show black background for animation
+			if (isDefined(self.spectator_blackbg))
+			{
+				self.spectator_blackbg destroy2();
+				self.spectator_blackbg = undefined;
+			}
+			self.spectator_blackbg = addHUDClient(self, 0, 0, undefined, undefined, "left", "top", "fullscreen", "fullscreen");
+			self.spectator_blackbg.alpha = 1;
+			self.spectator_blackbg.sort = -3;
+			self.spectator_blackbg.foreground = true;
+			self.spectator_blackbg.archived = false;
+			self.spectator_blackbg SetShader("black", 640, 480);
+
+			return true;
+		}
+
+		// Left mause | Right mouse
+		// not received in free spectating, because menu mouse is not working
+		else if (response == "mouse1" || response == "mouse2")
+		{
+			//self iprintln("mouse1");
+
+			// We were in cinematic move, just cancel it
+			if (self.spectatingSystem_inCinematic)
+			{
+				self.spectatingSystem_inCinematic = false;
+				return true;
+			}
+
+			selectedPlayer = undefined;
+			if (response == "mouse1") selectedPlayer = level getNextPlayerFrom(level.spectatingSystem_player);
+			if (response == "mouse2") selectedPlayer = level getPreviousPlayerFrom(level.spectatingSystem_player);
+
+
+			if (isDefined(selectedPlayer))
+			{
+				if (self.spectatingSystem_turnedOn == false)
+				{
+					self spectatingSystemTurnOn();
+					if (level.debug_spectator) self iprintln("MENU_MOUSE> ^2spectating system turned ON");
+				}
+
+				self.spectatingSystem_freeSpectating = false; // free spectating ended, now following a player
+				if (level.debug_spectator) self iprintln("MENU_MOUSE> self.spectatingSystem_freeSpectating = ^1false");
+
+				level followPlayer(selectedPlayer);
+				level maps\mp\gametypes\_spectating_system_auto::lockFor(15000); // Lock selected player for 15 secods
+			}
+			else
+			{
+				if (level.debug_spectator) self iprintln("MENU_MOUSE> ^1NO ONE TO FOLLOW");
+			}
+
+
+
+			return true;
+		}
+
+		// Middle button
+		else if (response == "mouse3")
+		{
+			level maps\mp\gametypes\_spectating_system_auto::autoSpectatorToggle();
+			return true;
+		}
+
+		// Middle button
+		else if (response == "xray")
+		{
+			self thread maps\mp\gametypes\_spectating_system_xray::toggle();
+			return true;
+		}
+
+		// Middle button
+		else if (response == "hit")
+		{
+			self thread maps\mp\gametypes\_spectating_system_damage::toggle();
+			return true;
+		}
+
+		// Middle button
+		else if (response == "help")
+		{
+			self thread maps\mp\gametypes\_spectating_system_hud::keys_toggle();
+			self thread maps\mp\gametypes\_spectating_system_hud::HUD_KeysWelcome_hide();
+
+			if (self.pers["spectatingSystem_keysConfirmed"] == false)
+			{
+				// Enable auto spectator team join
+				self join_spectator_enable();
+			}
+
+			self.pers["spectatingSystem_keysConfirmed"] = true; // dont open keys again
+
+			return true;
+		}
+
+		// scoreboard
+		else if (response == "score")
+		{
+			if (level.gametype == "sd")
+			{
+				if (self.pers["scoreboard_keepRefreshing"] == 0)
+					self thread maps\mp\gametypes\_menu_scoreboard::generatePlayerList(true); // toggle
+				else
+					self.pers["scoreboard_keepRefreshing"] = 0;
+			}
+			else
+				self thread maps\mp\gametypes\_spectating_system_hud::HUD_CloseMenuWarning_show();
+
+			return true;
+		}
+
+
+		// unexpcted bind
+		else if (response == "warning")
+		{
+			self thread maps\mp\gametypes\_spectating_system_hud::HUD_CloseMenuWarning_show();
+
+			return true;
+		}
+
+		else
+		{
+			i = -1;
+	    		switch(response)
+			{
+				case "follow_1": i = 1; break;
+				case "follow_2": i = 2; break;
+				case "follow_3": i = 3; break;
+				case "follow_4": i = 4; break;
+				case "follow_5": i = 5; break;
+				case "follow_6": i = 6; break;
+				case "follow_7": i = 7; break;
+				case "follow_8": i = 8; break;
+				case "follow_9": i = 9; break;
+				case "follow_10": i = 10; break;
+			}
+
+			if (i > -1)
+			{
+				// We were in cinematic move, cancel it
+				if (self.spectatingSystem_inCinematic)
+					self.spectatingSystem_inCinematic = false;
+
+				if (self.spectatingSystem_turnedOn == false)
+				{
+					self spectatingSystemTurnOn();
+					if (level.debug_spectator) self iprintln("FOLLOW_KEY> ^2spectating system turned ON");
+				}
+
+				self maps\mp\gametypes\_spectating_system_hud::followPlayerByNum(i);
+
+				return true;
+			}
+		}
+	}
+}
+
+
+/*
+Open QuickMessage menu trick
+- this menu is usefull because it does not hide HUD elements as standart menu does
+- but this menu is openable only via command /mp_qucikmessage in client side
+- also to open this menu player must be alive player (wich spectator is not)
+- trick is is move spectator into "none" team and set him as "dead", in wich case the /mp_qucikmessage works
+- only problem is that this game is quite bugged and there are some side effect:
+	- if players in "allies" or "axis" team are all dead and they are in "spectator" state,
+	  for some reason players with clientId lower then spectator clientId starts following this spectator
+	- because spectator is spawned outside map and then imidietly back to spectating mode, players
+	  with lower clientId stays outside map
+	- we need to save current position of players with clientId lower then spectator clientId and
+	  only if all players are dead in their team
+*/
+openSpectMenu(enableCursor)
+{
+	self endon("disconnect");
+
+	// Dont run multiple threads
+	if (isDefined(self.spectatingMenuOpenRunning))
+		return false;
+
+	// Menu is already opened, just set required cursor mode
+	if (self.pers["spectatingSystem_menu_opened"])
+	{
+		// Cursor
+		if (enableCursor) 	self setClientCvar2("cl_bypassMouseInput", 0); // 0 = enable menu cursor moving, disable ingame mouse
+		else 			self setClientCvar2("cl_bypassMouseInput", 1); // 1 = disable menu cursor moving, enable ingame mouse
+		return;
+	}
+
+	if (self.sessionteam != "spectator" || self.sessionstate != "spectator")
+		return;
+
+	self.spectatingMenuOpenRunning = true;
+
+	// Before opening menu we need to wait, otherwise forcing self.spectatorclient wont work for some reason
+	waittillframeend;
+
+	// Handle none team bug
+	level thread handleMenuSpectatingBug(self);
+
+	// Hide scoreboard from ingame menu
+	self.pers["scoreboard_keepRefreshing"] = 0;
+
+
+	spectatorclient = self.spectatorclient;
+	origin = self getOrigin();
+	angles = self getPlayerAngles();
+
+	// Black fullscreen backgound with animation
+	if (isDefined(self.spectator_blackbg))
+	{
+		self.spectator_blackbg destroy2();
+		self.spectator_blackbg = undefined;
+	}
+	self.spectator_blackbg = addHUDClient(self, 0, 0, undefined, undefined, "left", "top", "fullscreen", "fullscreen");
+	self.spectator_blackbg.alpha = 1;
+	self.spectator_blackbg.sort = -3;
+	self.spectator_blackbg.foreground = true;
+	self.spectator_blackbg.archived = false;
+	self.spectator_blackbg SetShader("black", 640, 480);
+
+
+	// Try to execute the command every second untill its confirmed by openscriptmenu
+	retry = 0;
+	self.pers["spectatingSystem_menu_open_confirmed"] = false;
+	while(!self.pers["spectatingSystem_menu_open_confirmed"] && self.pers["team"] == "streamer")
+	{
+		self.spectatorclient = -1;
+		self.sessionteam = "none";
+		self.sessionstate = "dead"; // enable quickmessage
+
+		// In "dead" session state the angle of player is computed by game and cannot be changed with script
+		// That will cause weird flickering, so rather show black screen instead by spawning outside map
+		self spawn((-99999, -99999, -99999), (0,0,0));
+
+		self setClientCvar2("ui_quickmessage_spectatormode", "1");
+
+		// Cursor
+		if (enableCursor) 	self setClientCvar2("cl_bypassMouseInput", 0); // 0 = enable menu cursor moving, disable ingame mouse
+		else 			self setClientCvar2("cl_bypassMouseInput", 1); // 1 = disable menu cursor moving, enable ingame mouse
+
+		// Exec command on client side
+		// If some menu is already opened:
+		//	- by player (main menu / quick messages) -> NOT WORKING - command will not be executed
+		//	- by player (by ESC key) -> that menu will be closed
+		//  	- by script (via openMenu()) -> that menu will be closed and exec_cmd will not be closed correctly
+		//			(mouse will be visible with clear backgorund.... so closeMenu() is called to close that menu)
+		self setClientCvar2("exec_cmd", "mp_quickmessage");
+		self openMenu(game["menu_exec_cmd"]);		// open menu via script
+		self closeMenu();				// will only close menu opened by script
+
+		if (retry >= 3)
+		{
+			self iprintln("^1Cannot open spectating system menu. Please press ^3[ESC]^1 key");
+			retry = 0;
+		}
+		if (level.debug_spectator) self iprintln("^3Opening mp_quickmessage with spectator mode...");
+
+		// Wait a second before next menu opening
+		for (i = 0; i < 9 && !self.pers["spectatingSystem_menu_open_confirmed"]; i++)
+			wait level.fps_multiplier * .1;
+
+		retry++;
+	}
+
+	// Restore to previous state
+	if (self.pers["team"] == "streamer")
+	{
+		self.sessionteam = "spectator";
+		self.sessionstate = "spectator";
+
+		//if (self.spectatorclient == -1 && spectatorclient != -1)
+		//	self.spectatorclient = spectatorclient;
+		//else
+
+		self spawn(origin, angles);
+
+		self.pers["spectatingSystem_menu_opened"] = true;
+	}
+
+	self.spectatingMenuOpenRunning = undefined;
+
+
+	if (self.pers["team"] == "streamer" && isDefined(self.spectator_blackbg))
+	{
+		self.spectator_blackbg FadeOverTime(0.25);
+		self.spectator_blackbg.alpha = 0;
+
+		wait level.fps_multiplier * .25;
+
+		if (isDefined(self.spectator_blackbg))
+			self.spectator_blackbg destroy2();
+	}
+}
+
+
+
+
+
+handleMenuSpectatingBug(player)
+{
+	allies = 0;
+	axis = 0;
+	players = getentarray("player", "classname");
+	for(i = 0; i < players.size; i++)
+	{	// Count alive players in teams
+		if (players[i].sessionteam == "allies" && players[i].sessionstate != "spectator")	allies++;
+		if (players[i].sessionteam == "axis"   && players[i].sessionstate != "spectator")	axis++;
+	}
+	for(i = 0; i < players.size; i++)
+	{	// clientId is lower then spectator and not player are alive in team
+		if (players[i] GetEntityNumber() < player GetEntityNumber() &&
+		   ((allies == 0 && players[i].sessionteam == "allies") || (axis == 0 && players[i].sessionteam == "axis")))
+		{
+			players[i].spectating_killcam_origin = players[i].origin;
+			players[i].spectating_killcam_angles = players[i].angles;
+		}
+	}
+
+	// Wait till player disconnect or is back from none team
+	while(isDefined(player) && player.sessionteam == "none")
+		wait level.frame;
+
+	// Spawn to previous location
+	players = getentarray("player", "classname");
+	for(i = 0; i < players.size; i++)
+	{
+		if (isDefined(players[i].spectating_killcam_origin))
+		{
+			players[i] spawn(players[i].spectating_killcam_origin, players[i].spectating_killcam_angles);
+			players[i].spectating_killcam_origin = undefined;
+			players[i].spectating_killcam_angles = undefined;
+			if (level.debug_spectator) iprintln("^1 APPLIED SPECTATE BUG FIX for " + players[i].name);
+		}
+	}
+}
+
+
+
+
+
+
+// self.spectatorclient is used to force spectating player
+// By default is -1 - dont force
+// Other number represents spectated client id
+// If is set, player is not able to change spectated player
+// self.spectatorclient does not show actually spectated player
+player_loop()
+{
+	self endon("disconnect");
+
+	inKillcam = false;
+	playerChanged = false;
+	self.waitForAttackKeyRelease = false;
+	self.waitForMeleeKeyRelease = false;
+	self.waitForUseKeyRelease = false;
+
+	for(;;)
+	{
+		wait level.frame;
+
+		// End this thread if player join team
+		if (self.pers["team"] != "streamer")
+		{
+			self spectatingSystemTurnOff();
+			self spectatingSystemExit();
+			break;
+		}
+
+		// Use own variable to suppress double F press
+		if (isDefined(self.killcam))
+			inKillcam = true;
+		else if (!(self usebuttonpressed()))
+			inKillcam = false;
+
+
+		// Skip these key checks if we are in killcam
+		if (inKillcam)
+			continue;
+
+		// Key attack
+		if(self attackbuttonpressed() && !self.waitForAttackKeyRelease)
+		{
+			self.waitForAttackKeyRelease = true;
+			self thread handleAttackButtonPress();
+		}
+
+		// Key Shift
+		if(self meleebuttonpressed() && !self.waitForMeleeKeyRelease)
+		{
+			self.waitForMeleeKeyRelease = true;
+			self thread handleMeleeButtonPress();
+		}
+
+		// Key F
+		if(self usebuttonpressed() && !self.waitForUseKeyRelease && !self.spectatingSystem_killcam_proposingVisible)	// Ignore F press is killcam proposing is visible
+		{
+			self.waitForUseKeyRelease = true;
+			self thread handleUseButtonPress();
+		}
+
+		// Unable to change player
+		if (playerChanged)
+		{
+			playerChanged = false;
+
+			if (self.spectatorclient == -1)
+			{
+				if (level.debug_spectator) self iprintln("^1 UNABLE ^8to set self.spectatorclient="+level.spectatingSystem_playerID);
+
+				wait level.fps_multiplier * 1;
+
+				continue;
+			}
+			else
+				self.spectatingSystem_freeSpectating = false; // free spectating ended, now following a player
+		}
+
+		// Make sure we always follow somebody
+		if (self.spectatingSystem_turnedOn && !self.spectatingSystem_inCinematic && !isDefined(self.killcam) && self.sessionstate == "spectator" && level.spectatingSystem_playerID != self.spectatorclient)
+		{
+			self.spectatorclient = level.spectatingSystem_playerID;
+
+			if (level.debug_spectator) self iprintln("^8 set self.spectatorclient="+level.spectatingSystem_playerID);
+
+			playerChanged = true;
+		}
+	}
+}
+
+
+
+handleAttackButtonPress()
+{
+	self endon("disconnect");
+
+	if (level.debug_spectator) self iprintln("attackBtn");
+
+	player = level getNextPlayerFrom(level.spectatingSystem_player);
+	withCursor = true;
+
+	if (!isDefined(player))
+	{
+		self iprintln("No player to follow");
+		withCursor = false;
+	}
+
+	// Start following nearby player
+	if (isDefined(self.spectatingSystem_playerToFollow) && self.spectatingSystem_freeSpectating && !self.spectatingSystem_turnedOn)
+	{
+		if (level.debug_spectator) self iprintln("MENU_MOUSE> follow close by player");
+
+		level followPlayer(self.spectatingSystem_playerToFollow);
+		level maps\mp\gametypes\_spectating_system_auto::lockFor(15000); // Lock selected player for 15 secods
+	}
+
+	// Open menu overlay (with cursor)
+	self thread openSpectMenu(withCursor);
+
+	// Enable spectating
+	if (self.spectatingSystem_turnedOn == false)
+	{
+		self spectatingSystemTurnOn();
+		if (level.debug_spectator) self iprintln("attackBtn> ^2spectating system turned ON");
+	}
+
+	while(self attackbuttonpressed())
+		wait level.frame;
+
+	self.waitForAttackKeyRelease = false;
+}
+
+
+handleMeleeButtonPress()
+{
+	self endon("disconnect");
+
+	if (level.debug_spectator) self iprintln("meleeBtn");
+
+	// We are not in spectating system - what ever spectator state is, now we pressed shift for freespectating
+	if (!self.spectatingSystem_turnedOn)
+	{
+		self.spectatingSystem_freeSpectating = true; // free spectating, not following any player
+		if (level.debug_spectator) self iprintln("meleeBtn> self.spectatingSystem_freeSpectating = ^2true");
+	}
+
+	// Reopen menu overlay (without cursor)
+	self.pers["spectatingSystem_menu_opened"] = false;
+	self thread openSpectMenu(false);
+
+	while(self meleeButtonPressed())
+		wait level.frame;
+
+	self.waitForMeleeKeyRelease = false;
+}
+
+handleUseButtonPress()
+{
+	self endon("disconnect");
+
+	if (level.debug_spectator) self iprintln("useBtn");
+
+	while(self useButtonPressed())
+		wait level.frame;
+
+	self.waitForUseKeyRelease = false;
+}
+
+
+
+
+spectatingSystemTurnOn()
+{
+	self.spectatingSystem_turnedOn = true;
+}
+
+
+spectatingSystemTurnOff()
+{
+	self.spectatingSystem_turnedOn = false;
+	self.spectatorclient = -1;
+}
+
+spectatingSystemExit()
+{
+	self thread maps\mp\gametypes\_spectating_system_hud::keys_hide();
+	self thread maps\mp\gametypes\_spectating_system_hud::HUD_ActivateSpectatingSystem_hide();
+}
+
+
+cinematicMove()
+{
+	self endon("disconnect");
+
+	// Wait untill other players connect and we have player to follow
+	waittillframeend;
+
+	self.spectatingSystem_inCinematic = true;
+
+	if (level.debug_spectator) self iprintln(gettime() + " cinematic> runned");
+
+	// Wait till menu is opened
+	for (i = 0; ; i++)
+	{
+		if (self.pers["team"] != "streamer") // leaved spectator
+		{
+			if (level.debug_spectator) self iprintln("cinematic> canceled because team != streamer");
+			self.spectatingSystem_inCinematic = false;
+		}
+		// Alive player that was followed spawned to spectators
+		if (level.spectatingSystem_playerID == self getEntityNumber())
+		{
+			if (level.debug_spectator) self iprintln("cinematic> canceled because this player is followed");
+			self.spectatingSystem_inCinematic = false;
+		}
+		// Not in strattime
+		if (!isDefined(level.in_strattime) || !level.in_strattime)
+		{
+			if (level.debug_spectator) self iprintln("cinematic> canceled because level.in_strattime = false");
+			self.spectatingSystem_inCinematic = false;
+		}
+		// In bash
+		if (isDefined(level.in_bash) && level.in_bash)
+		{
+			if (level.debug_spectator) self iprintln("cinematic> canceled because level.in_bash = true");
+			self.spectatingSystem_inCinematic = false;
+		}
+		// Time elapsed
+		if (i > 30)
+		{
+			if (level.debug_spectator) self iprintln("cinematic> canceled because conditions time 3s elapsed");
+			self.spectatingSystem_inCinematic = false;
+		}
+
+
+		// All ready for cinematic move, exit
+		if (self.spectatingSystem_inCinematic && level.spectatingSystem_playerID != -1 && self.spectatingSystem_turnedOn && self.pers["spectatingSystem_menu_opened"] && self.sessionstate == "spectator")
+			break;
+
+
+		// Cinematic was canceled, or this is second run
+		if (i == 0 && self.origin == (0,0,0))
+		{
+			spawnpoints = getentarray("mp_global_intermission", "classname");
+			spawnpoint = maps\mp\gametypes\_spawnlogic::getSpawnpoint_Random(spawnpoints);
+			if(isdefined(spawnpoint)) self spawn(spawnpoint.origin, spawnpoint.angles);
+		}
+
+		// Canceled
+		if (self.spectatingSystem_inCinematic == false)
+		{
+			if (level.debug_spectator)
+			{
+				self iprintln("^1cinematic> canceled");
+
+				if (!self.spectatingSystem_turnedOn) 		self iprintln("cinematic> ^1self.spectatingSystem_turnedOn = false");
+				if (!self.pers["spectatingSystem_menu_opened"]) self iprintln("cinematic> ^1self.pers[spectatingSystem_menu_opened] = false");
+				if (self.sessionstate != "spectator") 		self iprintln("cinematic> ^1self.sessionstate != spectator");
+				if (level.spectatingSystem_playerID == -1) 	self iprintln("cinematic> ^1level.spectatingSystem_playerID = -1");
+			}
+			return;
+		}
+
+		wait level.fps_multiplier * 0.1;
+	}
+
+
+	if (level.debug_spectator) self iprintln(gettime() + " cinematic> doing cinematic for " + level.spectatingSystem_player.name);
+
+
+
+	player = level.spectatingSystem_player;
+	id = level.spectatingSystem_playerID;
+
+	stratime = 6; // 6
+	if (isDefined(level.strat_time)) stratime = level.strat_time;
+	length = stratime * 0.83333; // 5
+	acceleration = stratime * 0.5; // 3
+	deceleration = length - acceleration; // 2
+
+
+	origin = player.origin - (0, 0, 15);
+	angles = (25, player.angles[1] + 180, 0);
+	forward = AnglesToForward(angles); // 1.0 scale
+
+	dist = -50 + (-120 * (stratime / 6)); // how far
+	originStart = origin + (forward[0] * dist, forward[1] * dist, forward[2] * dist); // new pos
+
+	dist = -55; // how far
+	originEnd = origin + (forward[0] * dist, forward[1] * dist, forward[2] * dist); // new pos
+
+	//self iprintln(originStart);
+	//self iprintln(originEnd);
+
+
+	self spawn(originStart, angles);
+
+	if (self.classname != "player")
+	{
+		// For some reason, sometimes classname of spectator is not player and linkto() func does not work
+		// Error: entity (classname: 'noclass') does not currently support linkTo:
+		// Its propably caused when spawn() was not called yet
+		// this should avoid error
+		self iprintln("cinematic> ^1self.classname != player");
+		return;
+	}
+
+
+	//self setOrigin(originStart);
+	//self setPlayerAngles(angles);
+
+	self.spectatorLock = spawn("script_model", originStart);
+	self.spectatorLock.angles = angles;
+
+	self linkto(self.spectatorLock);
+
+
+
+	self.spectatingSystem_freeSpectating = false;
+
+
+	self.spectatorLock moveTo(originEnd, length, acceleration, deceleration);
+
+	startTime = getTime();
+	for(;;)
+	{
+		// Cinematic canceled or some key was pressed
+		if (!self.spectatingSystem_inCinematic)
+		{
+			if (level.debug_spectator) self iprintln("cinematic> DONE because it was canceled");
+			break;
+		}
+		// Player changed team
+		if (self.pers["team"] != "streamer")
+		{
+			if (level.debug_spectator) self iprintln("cinematic> DONE because team is not streamer");
+			break;
+		}
+		// Spectated player changed
+		if (level.spectatingSystem_playerID != id)
+		{
+			if (level.debug_spectator) self iprintln("cinematic> DONE because followed player was changed");
+			break;
+		}
+		// Strattime is over
+		if (isDefined(level.in_strattime) && !level.in_strattime)
+		{
+			if (level.debug_spectator) self iprintln("cinematic> DONE because strattime is over");
+			break;
+		}
+
+		// Time elapsed
+		if ((gettime() - startTime) > (length * 1000))
+		{
+			if (level.debug_spectator) self iprintln("cinematic> DONE becuase time elapsed");
+			break;
+		}
+
+		self setPlayerAngles(angles);
+
+		wait level.frame;
+	}
+
+	self unlink();
+
+	self.spectatingSystem_inCinematic = false;
+}
+
+
+getRecommandedPlayer()
+{
+	if (level.gametype != "sd")
+	{
+		return findBestPlayer();
+	}
+
+	// If match info is enabled, ensure teams are in correct sides
+	teamLeft = "allies";
+	teamRight = "axis";
+	if ((game["scr_matchinfo"] == 1 || game["scr_matchinfo"] == 2) && game["match_team1_side"] == "axis")
+	{
+		teamLeft = "axis";
+		teamRight = "allies";
+	}
+
+	/*
+	Follow in this direction:
+	Round	TEAM1	TEAM2
+	1	sniper
+	2		sniper
+	3	best
+	4		best
+	5	p1
+	6		p1
+	7	p2
+	8		p2
+	9	best
+	10		best
+	11	p1
+	12		p1
+	13	p2
+	14		p2
+	15	...	...
+
+
+	*/
+
+
+	selectedPlayer = undefined;
+
+
+	// Team left
+	if (game["round"] % 2 != 0)
+	{
+		if (game["round"] == 1)
+		{
+			// Find sniper of first team
+			selectedPlayer = findSniper(teamLeft);
+			game["spectatingSystem_recommandedPlayerMode_teamLeft_player"] = selectedPlayer;
+
+			if (isDefined(selectedPlayer)) printToSpectators("Spectating player with scope in team " + teamLeft + ": " + selectedPlayer.name);
+		}
+		if (game["round"] % 3 == 0) // every 3. rounds
+		{
+			// Find best player with the most kills
+			selectedPlayer = findBestPlayer(teamLeft);
+
+			if (isDefined(selectedPlayer)) printToSpectators("Spectating best player in team " + teamLeft + ": " + selectedPlayer.name);
+		}
+	}
+	// Team right
+	else
+	{
+		if (game["round"] == 2)
+		{
+			// Find sniper of first team
+			selectedPlayer = findSniper(teamRight);
+			game["spectatingSystem_recommandedPlayerMode_teamRight_player"] = selectedPlayer;
+
+			if (isDefined(selectedPlayer)) printToSpectators("Spectating player with scope in team " + teamRight + ": " + selectedPlayer.name);
+		}
+		else if ((game["round"]-1) % 3 == 0) // every 3. rounds
+		{
+			// Find best player with the most kills
+			selectedPlayer = findBestPlayer(teamRight);
+
+			if (isDefined(selectedPlayer)) printToSpectators("Spectating best player in team " + teamRight + ": " + selectedPlayer.name);
+		}
+
+	}
+
+
+	// Find next player in row as default
+	if (!isDefined(selectedPlayer))
+	{
+		// Team left
+		if (game["round"] % 2 != 0)
+		{
+			selectedPlayer = getNextPlayerFrom(game["spectatingSystem_recommandedPlayerMode_teamLeft_player"], teamLeft);
+			game["spectatingSystem_recommandedPlayerMode_teamLeft_player"] = selectedPlayer;
+
+			if (isDefined(selectedPlayer)) printToSpectators("Spectating next player in team " + teamLeft + ": " + selectedPlayer.name);
+		}
+		// Team right
+		else
+		{
+			selectedPlayer = getNextPlayerFrom(game["spectatingSystem_recommandedPlayerMode_teamRight_player"], teamRight);
+			game["spectatingSystem_recommandedPlayerMode_teamRight_player"] = selectedPlayer;
+
+			if (isDefined(selectedPlayer)) printToSpectators("Spectating next player in team " + teamRight + ": " + selectedPlayer.name);
+		}
+
+	}
+
+	return selectedPlayer;
+}
+
+findSniper(team)
+{
+	selectedPlayer = undefined;
+	players = getentarray("player", "classname");
+	for(i = 0; i < players.size; i++)
+	{
+		player = players[i];
+		if ((player.pers["team"] == team) && player.sessionstate == "playing" && isDefined(player.pers["weapon"]))
+		{
+			weaponData = level.weapons[player.pers["weapon"]];
+
+			if (isDefined(weaponData) && weaponData.classname == "sniper")
+			{
+				selectedPlayer = player;
+
+				break;
+			}
+		}
+	}
+	return selectedPlayer;
+}
+
+findBestPlayer(team)
+{
+	lastPlayer = undefined;
+
+	if (!isDefined(team))
+		team = "all";
+
+	// Select player to watch by score and time
+	players = getentarray("player", "classname");
+	for(i = 0; i < players.size; i++)
+	{
+		player = players[i];
+		if ((team == "all" || player.pers["team"] == team) && player.sessionstate == "playing")
+		{
+			if (!isDefined(lastPlayer) ||
+			  player.score > lastPlayer.score ||
+			  (player.score == lastPlayer.score && player.deaths < lastPlayer.deaths))
+				lastPlayer = player;
+		}
+	}
+
+	if (isDefined(lastPlayer))
+		return lastPlayer;
+	else
+		return undefined;
+}
+
+getPreviousPlayerFrom(actualSpectatedPlayer, team)
+{
+	return getPlayerFrom(actualSpectatedPlayer, team, true);
+}
+
+getNextPlayerFrom(actualSpectatedPlayer, team)
+{
+	return getPlayerFrom(actualSpectatedPlayer, team, false);
+}
+
+
+getPlayerFrom(actualSpectatedPlayer, team, reverse)
+{
+	selectedPlayer = undefined;
+	useNextId = false;
+
+	// Join teams
+	players = maps\mp\gametypes\_spectating_system_hud::getPlayersByTeam();
+	playersFinal = [];
+	if (!isDefined(team) || team == "allies")
+	{
+		for (i = 0; i < players.size; i++)
+		{
+			if (players[i].pers["team"] == "allies")
+				playersFinal[playersFinal.size] = players[i];
+		}
+	}
+	// PLayers from allies should be selected, but the team is empty -> follow from both teams
+	if (isDefined(team) && team == "allies" && playersFinal.size == 0)
+		return getPlayerFrom(actualSpectatedPlayer, undefined, reverse);
+
+
+	if (!isDefined(team) || team == "axis")
+	{
+		for (i = 0; i < players.size; i++)
+		{
+			if (players[i].pers["team"] == "axis")
+				playersFinal[playersFinal.size] = players[i];
+		}
+	}
+	// PLayers from allies should be selected, but the team is empty -> follow from both teams
+	if (isDefined(team) && team == "axis" && playersFinal.size == 0)
+		return getPlayerFrom(actualSpectatedPlayer, undefined, reverse);
+
+
+	for(i = 0; i < playersFinal.size; i++)
+	{
+		player = playersFinal[i];
+
+		//iprintln("--" + player.name);
+
+		// Skip dead players
+		if (player.sessionstate != "playing")
+			continue;
+
+
+		if (reverse)
+		{
+			// Previous player is saved in selectedPlayer
+			if (isDefined(selectedPlayer) && isDefined(actualSpectatedPlayer) && actualSpectatedPlayer == player)
+				break;
+
+			selectedPlayer = player;
+		}
+		else
+		{
+			// Save first player in case actually folowed player is the last one
+			if (!isDefined(selectedPlayer))
+				selectedPlayer = player;
+
+			if (useNextId)
+			{
+				selectedPlayer = player;
+				break;
+			}
+
+			// If this player is actually followed, next player is the one we will follow next
+			if (isDefined(actualSpectatedPlayer) && actualSpectatedPlayer == player)
+				useNextId = true;
+		}
+
+
+
+
+	}
+
+	// Debug print
+	if (isDefined(selectedPlayer))
+	{
+		teamStr = "from both teams"; if (isDefined(team)) teamStr = "in team " + team;
+		if (level.debug_spectator) printToSpectators(">selecting next player "+teamStr+": " + selectedPlayer.name);
+	}
+
+	return selectedPlayer;
+}
+
+
+
+followPlayer(selectedPlayer)
+{
+	level.spectatingSystem_playerID = selectedPlayer getEntityNumber();
+	level.spectatingSystem_player = selectedPlayer;
+	level.spectatingSystem_lastChange = getTime();
+
+	//if (level.debug_spectator) printToSpectators("Spect: set followed player: " + selectedPlayer.name);
+}
+
+
+stopFollowing()
+{
+	level.spectatingSystem_playerID = -1;
+	level.spectatingSystem_player = undefined;
+	level.spectatingSystem_lastChange = getTime();
+
+	//if (level.debug_spectator) printToSpectators("Spect: set followed player: " + selectedPlayer.name);
+}
+
+
+followNextPlayer()
+{
+	selectedPlayer = undefined;
+
+	// First try to find player from the same team
+	if (isDefined(level.spectatingSystem_player))
+	{
+		selectedPlayer = getNextPlayerFrom(level.spectatingSystem_player, level.spectatingSystem_player.pers["team"]);
+	}
+
+	// If not found, select from both teams
+	if (!isDefined(selectedPlayer))
+	{
+		selectedPlayer = getNextPlayerFrom(level.spectatingSystem_player);
+	}
+
+	if (isDefined(selectedPlayer))
+		followPlayer(selectedPlayer);
+	else
+		stopFollowing();
+}
+
+
+
+
+spectating_loop()
+{
+	selectedPlayer = getRecommandedPlayer();
+
+	// Follow recomanded player as first for some time before first switch
+	if (isDefined(selectedPlayer))
+	{
+		level followPlayer(selectedPlayer);
+	}
+	else if (level.debug_spectator) printToSpectators("> no recommanded player");
+
+
+	no_one = false;
+	for(;;)
+	{
+		wait level.fps_multiplier * 0.1;
+
+
+		id = level.spectatingSystem_playerID;
+		spectated_player = level.spectatingSystem_player;
+
+		// If noone is followed, follow next player no matter what
+		if (id == -1 || !isDefined(spectated_player) || !isPlayer(spectated_player))
+		{
+			level followNextPlayer();
+
+			if (level.spectatingSystem_playerID != -1)
+				if (level.debug_spectator) printToSpectators("(no one was followed)");
+			else
+			{
+				if (level.debug_spectator && no_one == false) printToSpectators("(there is no one to follow)");
+				no_one = true;
+			}
+			continue;
+		}
+		no_one = false;
+
+		// If followed player is dead, follow next no matter what
+		if (spectated_player.sessionstate != "playing")
+		{
+			wait level.fps_multiplier * 1;
+
+			level followNextPlayer();
+			if (level.debug_spectator) printToSpectators("(followed player died)");
+			continue;
+		}
+	}
+}
+
+
+
+printToSpectators(text)
+{
+	players = getentarray("player", "classname");
+	for(i = 0; i < players.size; i++)
+	{
+		player = players[i];
+		if (player.pers["team"] == "streamer" /*&& player.spectatingSystem_turnedOn*/)
+		{
+			player iprintln(text);
+			break;
+		}
+	}
+}
+
+
+isSpectatorInKillcam()
+{
+	in_killcam = false;
+
+	players = getentarray("player", "classname");
+	for(i = 0; i < players.size; i++)
+	{
+		player = players[i];
+
+		if (player.pers["team"] == "streamer" && player.sessionstate == "spectator" && isDefined(player.killcam) && player.killcam == true)
+		{
+			in_killcam = true;
+			break;
+		}
+	}
+
+	return in_killcam;
+}
+
+
+waitForSpectatorsInKillcam()
+{
+	// Check if some spectator is in killcam
+	in_killcam = level isSpectatorInKillcam();
+	if (in_killcam)
+	{
+		// HUD
+		hud = addHUD(-85, 280, 1.2, (1,1,0), "center", "middle", "right");
+		hud showHUDSmooth(.5);
+		hud setText(game["STRING_SPECTATINGSYSTEM_KILLCAM_REPLAY"]);
+
+		// Disable players weapons
+		players = getentarray("player", "classname");
+		for(i = 0; i < players.size; i++)
+		{
+			player = players[i];
+			if (player.sessionstate == "playing")
+				player disableWeapon();
+		}
+
+		// Delete weapons in map
+		for (i = 0; i < level.weaponnames.size; i++)
+		{
+			weapon = level.weaponnames[i];
+			weapons = getentarray("weapon_" + weapon, "classname");
+			for(j = 0; j < weapons.size; j++)
+				weapons[j] delete();
+		}
+
+		count = 2;
+		for(;;)
+		{
+			wait level.fps_multiplier * 1;
+			in_killcam = level isSpectatorInKillcam();
+
+			if (!in_killcam)
+				count--;
+			else
+				count = 2;
+
+			if (count <= 0)
+				break;
+		}
+
+		hud hideHUDSmooth(.5);
+
+		wait level.fps_multiplier * 0.5;
+	}
+
+	return true;
+}
diff --git a/source/maps/mp/gametypes/_spectating_system_auto.gsc b/source/maps/mp/gametypes/_spectating_system_auto.gsc
new file mode 100644
index 0000000..9eb687c
--- /dev/null
+++ b/source/maps/mp/gametypes/_spectating_system_auto.gsc
@@ -0,0 +1,665 @@
+#include maps\mp\gametypes\global\_global;
+
+init()
+{
+	if(game["firstInit"])
+	{
+		precacheString2("STRING_AUTO_SPECTATING", 				&"Auto-spectating");
+		precacheString2("STRING_AUTO_SPECTATING_OFF", 				&"Auto-spectating off");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_MANUAL", 		&"Manual change");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_VISIBLE_ENEMY", 		&"Enemy in sight");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_VISIBLE_BY_ENEMY", 	&"Spotted by enemy");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_VISIBLE_ENEMY_IN_FUTURE", 	&"Enemy in sight (P)");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_VISIBLE_BY_ENEMY_IN_FUTURE", 	&"Spotted by enemy (P)");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_BOMB_PLANTED", 		&"Bomb planted");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_BOMB_SCORE", 		&"Follow losing team");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_LAST_PLAYER", 		&"Last player in team");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_1V1_SCORE", 		&"1v1 losing team");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_NO_ACTION_NEARBY", 	&"Next to each other");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_NO_ACTION_MOVING", 	&"Follow moving player");
+		precacheString2("STRING_AUTO_SPECTATING_REASON_RADIO_DEFEND", 		&"Radio defending team");
+
+		game["STRING_AUTO_SPECT_IS_ENABLED"] = 		"Auto-spectator is ^2On";
+		game["STRING_AUTO_SPECT_IS_DISABLED"] = 	"Auto-spectator is ^1Off";
+	}
+
+	level.spectatingSystem_auto_turnedOn = true;
+	level.spectatingSystem_auto_lockedUntill = 0;
+	level.spectatingSystem_auto_statusText = "STRING_AUTO_SPECTATING";
+	level.spectatingSystem_auto_runThreads = false;
+
+
+	if (!level.spectatingSystem)
+	{
+		return;
+	}
+
+	addEventListener("onConnected",  	::onConnected);
+	addEventListener("onConnectedAll",    	::onConnectedAll);
+}
+
+onConnected()
+{
+	self.spectatingSystem_inCinematic = false;
+}
+
+onConnectedAll()
+{
+	thread playersCanSeeEachOthers();
+	thread playersCloseToEachOther();
+	thread autoFollowedPlayer();
+}
+
+
+
+autoSpectatorEnable()
+{
+	level.spectatingSystem_auto_turnedOn = true;
+
+	level.spectatingSystem_auto_statusText = "STRING_AUTO_SPECTATING";
+
+	level printToAutoSpectators(game["STRING_AUTO_SPECT_IS_ENABLED"]);
+}
+
+
+autoSpectatorDisable()
+{
+	level printToAutoSpectators(game["STRING_AUTO_SPECT_IS_DISABLED"]);
+
+	level.spectatingSystem_auto_turnedOn = false;
+
+	level.spectatingSystem_auto_statusText = "STRING_AUTO_SPECTATING_OFF";
+}
+
+autoSpectatorToggle()
+{
+	if (!level.spectatingSystem_auto_turnedOn)
+		autoSpectatorEnable();
+	else
+		autoSpectatorDisable();
+}
+
+
+
+HUD_loop()
+{
+	self endon("disconnect");
+
+	if(!isdefined(self.spectatingSystem_HUD_autoSpectator_BG))
+	{
+		self.spectatingSystem_HUD_autoSpectator_BG = newClientHudElem2(self);
+		self.spectatingSystem_HUD_autoSpectator_BG.archived = false;
+		self.spectatingSystem_HUD_autoSpectator_BG.x = -40;
+		self.spectatingSystem_HUD_autoSpectator_BG.y = 40;
+		self.spectatingSystem_HUD_autoSpectator_BG.horzAlign = "center";
+		self.spectatingSystem_HUD_autoSpectator_BG.vertAlign = "top";
+		self.spectatingSystem_HUD_autoSpectator_BG.alpha = 0;
+		self.spectatingSystem_HUD_autoSpectator_BG.color = (0, 0, 0);
+		self.spectatingSystem_HUD_autoSpectator_BG setShader("white", 80, 10);
+	}
+
+	// Auto-spectating
+	if(!isdefined(self.spectatingSystem_HUD_autoSpectator))
+	{
+		self.spectatingSystem_HUD_autoSpectator = newClientHudElem2(self);
+		self.spectatingSystem_HUD_autoSpectator.horzAlign = "center";
+		self.spectatingSystem_HUD_autoSpectator.vertAlign = "top";
+		self.spectatingSystem_HUD_autoSpectator.alignX = "center";
+		self.spectatingSystem_HUD_autoSpectator.alignY = "top";
+		self.spectatingSystem_HUD_autoSpectator.x = 0;
+		self.spectatingSystem_HUD_autoSpectator.y = 42;
+		self.spectatingSystem_HUD_autoSpectator.archived = false;
+		self.spectatingSystem_HUD_autoSpectator.font = "default";
+		self.spectatingSystem_HUD_autoSpectator.alpha = 0;
+		self.spectatingSystem_HUD_autoSpectator.sort = 2;
+		self.spectatingSystem_HUD_autoSpectator.fontscale = 0.6;
+	}
+
+	hud_text_last = "";
+
+	for (;;)
+	{
+		if (self.pers["team"] != "streamer")
+			break;
+
+		if (!self.spectatingSystem_turnedOn || self.spectatingSystem_freeSpectating)
+		{
+			// Hide
+			if (self.spectatingSystem_HUD_autoSpectator_BG.alpha != 0) 	self.spectatingSystem_HUD_autoSpectator_BG.alpha = 0;
+			if (self.spectatingSystem_HUD_autoSpectator.alpha != 0) 	self.spectatingSystem_HUD_autoSpectator.alpha = 0;
+		}
+		else if (level.spectatingSystem_auto_turnedOn)
+		{
+			// Show
+			if (self.spectatingSystem_HUD_autoSpectator_BG.alpha != 0.5) 	self.spectatingSystem_HUD_autoSpectator_BG.alpha = 0.5;
+			if (self.spectatingSystem_HUD_autoSpectator.alpha != 1) 	self.spectatingSystem_HUD_autoSpectator.alpha = 1;
+
+			canSwitch = ((gettime() - level.spectatingSystem_auto_lockedUntill) > 0)  &&  ((gettime() - level.spectatingSystem_lastChange) > 6000);
+
+			color = (0, 0, 0); // black
+			if (canSwitch) color = (0.03, 0.18, 0.1); // green
+
+			if (self.spectatingSystem_HUD_autoSpectator_BG.color != color) 	self.spectatingSystem_HUD_autoSpectator_BG.color = color;
+		}
+		else
+		{
+			// No bg
+			if (self.spectatingSystem_HUD_autoSpectator_BG.alpha != 0) 	self.spectatingSystem_HUD_autoSpectator_BG.alpha = 0;
+			if (self.spectatingSystem_HUD_autoSpectator.alpha != 1) 	self.spectatingSystem_HUD_autoSpectator.alpha = 1;
+		}
+
+		// Update text with follow reason
+		if (level.spectatingSystem_auto_statusText != "" && level.spectatingSystem_auto_statusText != hud_text_last)
+		{
+			self.spectatingSystem_HUD_autoSpectator setText(game[level.spectatingSystem_auto_statusText]);
+		}
+		hud_text_last = level.spectatingSystem_auto_statusText;
+
+		wait level.fps_multiplier * 0.1;
+	}
+
+
+	// Destroy
+	if(isdefined(self.spectatingSystem_HUD_autoSpectator_BG))
+	{
+		self.spectatingSystem_HUD_autoSpectator_BG destroy2();
+		self.spectatingSystem_HUD_autoSpectator_BG = undefined;
+	}
+	if(isdefined(self.spectatingSystem_HUD_autoSpectator))
+	{
+		self.spectatingSystem_HUD_autoSpectator destroy2();
+		self.spectatingSystem_HUD_autoSpectator = undefined;
+	}
+}
+
+
+
+
+
+printToAutoSpectators(text)
+{
+	players = getentarray("player", "classname");
+	for(i = 0; i < players.size; i++)
+	{
+		player = players[i];
+		if (player.pers["team"] == "streamer" && player.spectatingSystem_turnedOn && level.spectatingSystem_auto_turnedOn)
+		{
+			player iprintln(text);
+			break;
+		}
+	}
+}
+
+
+
+playersCanSeeEachOthers()
+{
+	for (;;)
+	{
+		// Not enabled, wait
+		if (!level.spectatingSystem_auto_runThreads)
+		{
+			wait level.fps_multiplier * 3;
+			continue;
+		}
+
+		players = getentarray("player", "classname");
+		for(i = 0; i < players.size; i++)
+		{
+			player = players[i];
+			player.autospectator_visibleEnemy = undefined;
+			player.autospectator_seenByEnemy = undefined;
+
+			player.spectatingSystem_visibleEnemyInFuture = undefined;
+			player.spectatingSystem_seenByEnemyInFuture = undefined;
+		}
+
+		for(i = 0; i < players.size; i++)
+		{
+			player = players[i];
+
+			if (!isDefined(player)) continue; // because of wait player may be disconnected
+
+			if ((player.pers["team"] == "allies" || player.pers["team"] == "axis") && (player.sessionstate == "playing"))
+			{
+				eye = player maps\mp\gametypes\global\player::getEyeOrigin();
+				angles = player getPlayerAngles();
+
+				// If player is moving, predict future position
+				predictedPosition = undefined;
+				if (player.movingVector != (0, 0, 0))
+				{
+					multiplier = length(player.movingVector);
+					if (multiplier > 12)
+						multiplier = 12;
+					vector = VectorNormalize(player.movingVector);
+
+					multiplier = multiplier * 8;
+
+					futureEye = eye + (vector[0] * multiplier, vector[1] * multiplier, vector[2] * multiplier);
+
+					// Create forward point - it might be future position of player
+					forwardTrace = Bullettrace(eye, futureEye, false, player); // BulletTrace( <start>, <end>, <hit characters>, <ignore entity> )
+					predictedPosition = forwardTrace["position"];
+				}
+
+				// Debug point
+				if (level.debug_spectator)
+				{
+					if (!isDefined(player.spectatingSystem_eyeWaypoint))
+					{
+						player.spectatingSystem_eyeWaypoint = spawn("script_origin",(0,0,0));
+						player.spectatingSystem_eyeWaypoint thread maps\mp\gametypes\global\developer::showWaypoint();
+					}
+					if (isDefined(predictedPosition))
+						player.spectatingSystem_eyeWaypoint.origin = predictedPosition;
+					else
+					{
+						player.spectatingSystem_eyeWaypoint delete();
+						player.spectatingSystem_eyeWaypoint = undefined;
+					}
+				}
+
+
+				// Loop enemies of this player
+				for(j = 0; j < players.size; j++)
+				{
+					enemy = players[j];
+
+					if (!isDefined(enemy)) continue; // because of wait player may be disconnected
+
+					if (enemy != player && (enemy.pers["team"] == "allies" || enemy.pers["team"] == "axis") && enemy.pers["team"] != player.pers["team"] && (enemy.sessionstate == "playing"))
+					{
+						angles2 = vectorToAngles(enemy getOrigin() - player getOrigin());
+						angle_diff = angles[1] - angles2[1];
+
+						if (angle_diff > 180) angle_diff -= 360;
+						if (angle_diff < -180) angle_diff += 360;
+
+						//player iprintln("i have player " + enemy.name + " in angle" + angle_diff);
+
+						if (angle_diff > -35 && angle_diff < 35)
+						{
+							trace = Bullettrace(eye, enemy.headTag getOrigin(), true, player);
+							headVisible = isDefined(trace["entity"]) && trace["entity"] == enemy;
+
+							if (headVisible)
+							{
+								//player iprintln("i have players " + enemy.name + " head on screen");
+								player.autospectator_visibleEnemy = enemy;
+								enemy.autospectator_seenByEnemy = player;
+								continue;
+							}
+
+							// Check predicted position
+							else if (isDefined(predictedPosition))
+							{
+								// Check if future position is visible
+								trace = Bullettrace(predictedPosition, enemy.headTag getOrigin(), true, player);
+								headVisible = isDefined(trace["entity"]) && trace["entity"] == enemy;
+
+								if (headVisible)
+								{
+									//player iprintln("i will see player " + enemy.name + " in future");
+									player.spectatingSystem_visibleEnemyInFuture = enemy;
+									enemy.spectatingSystem_seenByEnemyInFuture = player;
+								}
+							}
+						}
+
+
+					}
+				}
+
+				//wait level.frame;
+			}
+		}
+
+		wait level.fps_multiplier * .1;
+	}
+
+}
+
+
+
+playersCloseToEachOther()
+{
+	for (;;)
+	{
+		// Not enabled, wait
+		if (!level.spectatingSystem_auto_runThreads)
+		{
+			wait level.fps_multiplier * 3;
+			continue;
+		}
+
+		dist_min = -1;
+		dist_player1 = undefined;
+		dist_player2 = undefined;
+
+		players = getentarray("player", "classname");
+		for(i = 0; i < players.size; i++)
+		{
+			player = players[i];
+
+			player.autoSpectating_veryCloseToEnemy = undefined;
+
+			if ((player.pers["team"] == "allies" || player.pers["team"] == "axis") && (player.sessionstate == "playing"))
+			{
+				for(j = 0; j < players.size; j++)
+				{
+					enemy = players[j];
+
+					if (enemy != player && (enemy.pers["team"] == "allies" || enemy.pers["team"] == "axis") && enemy.pers["team"] != player.pers["team"] && (enemy.sessionstate == "playing"))
+					{
+						dist = distance(player getOrigin(), enemy getOrigin());
+
+						if (dist < dist_min || dist_min == -1)
+						{
+							dist_min = dist;
+							dist_player1 = player;
+							dist_player2 = enemy;
+						}
+					}
+				}
+			}
+		}
+
+		if (dist_min != -1 && dist_min < 800)
+		{
+			dist_player1.autoSpectating_veryCloseToEnemy = dist_player2;
+			dist_player2.autoSpectating_veryCloseToEnemy = dist_player1;
+		}
+
+		wait level.fps_multiplier * .5;
+	}
+
+}
+
+
+lockFor(time)
+{
+	level.spectatingSystem_auto_lockedUntill = gettime() + time; // wait some time untill next change
+
+	if (level.spectatingSystem_auto_turnedOn)
+		level.spectatingSystem_auto_statusText = "STRING_AUTO_SPECTATING_REASON_MANUAL";
+}
+
+
+autoFollowedPlayer()
+{
+	level.spectatingSystem_auto_lockedUntill = gettime() + 18000; // wait some time untill next change (also consider strat time)
+
+	followed_team_last = "";
+	for(;;)
+	{
+		wait level.fps_multiplier * 0.1;
+
+		players = getentarray("player", "classname");
+
+		autospectator_exists = false;
+		players_exists = false;
+		for(i = 0; i < players.size; i++)
+		{
+			player = players[i];
+			if (player.pers["team"] == "streamer" && player.spectatingSystem_turnedOn && level.spectatingSystem_auto_turnedOn)
+				autospectator_exists = true;
+
+			if ((player.pers["team"] == "allies" || player.pers["team"] == "axis") && player.sessionstate == "playing")
+				players_exists = true;
+
+		}
+		level.spectatingSystem_auto_runThreads = (autospectator_exists && players_exists);
+
+		// No players, do nothing
+		if (level.spectatingSystem_auto_runThreads == false)
+			continue;
+
+		// In timeout
+		//if (level.in_readyup)
+		//	continue;
+
+		id = level.spectatingSystem_playerID;
+		spectated_player = level.spectatingSystem_player;
+
+		// If no one is followed, wait
+		if (id == -1 || !isDefined(spectated_player) || !isPlayer(spectated_player))
+			continue;
+
+		// Autospectator is locked to some player, dont switch
+		if (!level.spectatingSystem_auto_turnedOn)
+		{
+			wait level.fps_multiplier * 1;
+			level.spectatingSystem_auto_lockedUntill = gettime() + 3000; // wait some time untill next change
+			level.spectatingSystem_auto_statusText = "STRING_AUTO_SPECTATING_OFF";
+			continue;
+		}
+
+		// Can switch after 6 second from last switch
+		if ((gettime() - level.spectatingSystem_lastChange) < 6000)
+		{
+			continue;
+		}
+
+		// Dont switch when round ended
+		if (level.gametype == "sd" && level.roundended)
+			continue;
+
+
+
+		// Can switch after 6 second from last switch and untill timer expired
+		canSwitch = (gettime() - level.spectatingSystem_auto_lockedUntill) > 0;
+		if (!canSwitch)
+		{
+			// Player has visible enemy on their screen or enemy is seeing this player or their screen
+			// Extent time for this player
+			if (isDefined(spectated_player.autospectator_visibleEnemy) || isDefined(spectated_player.autospectator_seenByEnemy))
+			{
+				if (level.debug_spectator) printToAutoSpectators("Extending time for this player (visisble enemy)");
+				level.spectatingSystem_auto_lockedUntill = gettime() + 8000;
+				level.spectatingSystem_auto_statusText = "STRING_AUTO_SPECTATING_REASON_VISIBLE_ENEMY";
+				wait level.fps_multiplier * 1;
+			}
+
+			// Player has in future visible enemy on their screen or enemy is seeing this player or their screen
+			// Extent time for this player
+			if (isDefined(spectated_player.spectatingSystem_visibleEnemyInFuture) || isDefined(spectated_player.spectatingSystem_seenByEnemyInFuture))
+			{
+				if (level.debug_spectator) printToAutoSpectators("Extending time for this player (visisble enemy in future)");
+				level.spectatingSystem_auto_lockedUntill = gettime() + 4000;
+				level.spectatingSystem_auto_statusText = "STRING_AUTO_SPECTATING_REASON_VISIBLE_ENEMY_IN_FUTURE";
+				wait level.fps_multiplier * 1;
+			}
+
+			// Dont continue untill we can switch
+			continue;
+		}
+		else
+			level.spectatingSystem_auto_statusText = "STRING_AUTO_SPECTATING";
+
+		// Count numbers of players in teams
+		alliesAlive = 0;
+		axisAlive = 0;
+		teamPlayersCount = 0;
+		for(i = 0; i < players.size; i++)
+		{
+			player = players[i];
+			if ((player.pers["team"] == "allies" || player.pers["team"] == "axis"))
+			{
+				// Count alive players
+				if (player.sessionstate == "playing" || player.sessionstate == "dead") // dead players are players in spectator session state
+				{
+					if (player.pers["team"] == "allies")
+						alliesAlive++;
+					else
+						axisAlive++;
+				}
+				teamPlayersCount++;
+			}
+		}
+		// If it is 2v2 match or more
+		if (teamPlayersCount >= 4)
+		{
+			follow_team = "";
+			switch_reason = "";
+			hud_text = "";
+
+			// 1vX - always folow alone player
+			if (alliesAlive == 1 && axisAlive > 1)
+			{
+				follow_team = "allies";
+				switch_reason = "Last player in team";
+				hud_text = "STRING_AUTO_SPECTATING_REASON_LAST_PLAYER";
+			}
+
+			// 1vX - always folow alone player
+			else if (axisAlive == 1 && alliesAlive > 1)
+			{
+				follow_team = "axis";
+				switch_reason = "Last player in team";
+				hud_text = "STRING_AUTO_SPECTATING_REASON_LAST_PLAYER";
+			}
+
+			// 1v1 - follow player with lower team score
+			else if (alliesAlive == 1 && axisAlive == 1 && game["allies_score"] != game["axis_score"])
+			{
+				// if my team score is lower then enemy team
+				if (game["allies_score"] < game["axis_score"])
+					follow_team = "allies";
+				else
+					follow_team = "axis";
+
+				switch_reason = "1v1 and lower score";
+				hud_text = "STRING_AUTO_SPECTATING_REASON_1V1_SCORE";
+			}
+
+			if (follow_team != "")
+			{
+				for(i = 0; i < players.size; i++)
+				{
+					player = players[i];
+					if (player.pers["team"] == follow_team && (player.sessionstate == "playing" || player.sessionstate == "dead"))
+					{
+						level maps\mp\gametypes\_spectating_system::followPlayer(player);
+						if (level.debug_spectator) printToAutoSpectators(switch_reason);
+						level.spectatingSystem_auto_lockedUntill = gettime() + 1000; // wait some time untill next change
+						level.spectatingSystem_auto_statusText = hud_text;
+						break;
+					}
+				}
+				continue;
+			}
+		}
+
+
+
+		// By default, follow one team
+		followed_team = spectated_player.pers["team"];
+
+		// When bomb is planted, follow team with lower score
+		if (level.gametype == "sd" && level.bombplanted && alliesAlive >= 1 && axisAlive >= 1)
+		{
+			if ((gettime() - level.bombtimerstart) < 3000) // if no action, follow player who actually planted the bomb
+			{
+				if (isDefined(level.planting_player) && isAlive(level.planting_player)) // always follow planter when bomb is planted
+				{
+					level maps\mp\gametypes\_spectating_system::followPlayer(level.planting_player);
+					if (level.debug_spectator) printToAutoSpectators("Bomb planted, following planter");
+					level.spectatingSystem_auto_lockedUntill = gettime() + 4000; // wait some time untill next change
+					level.spectatingSystem_auto_statusText = "STRING_AUTO_SPECTATING_REASON_BOMB_PLANTED";
+					continue;
+				}
+			}
+			else if (game["allies_score"] != game["axis_score"])
+			{
+				if (game["allies_score"] < game["axis_score"])		followed_team = "allies";
+       			 	else if (game["allies_score"] > game["axis_score"])	followed_team = "axis";
+       			 	if (level.debug_spectator && followed_team != followed_team_last) printToAutoSpectators("bomb planted, following lower score team:" + followed_team);
+				level.spectatingSystem_auto_statusText = "STRING_AUTO_SPECTATING_REASON_BOMB_SCORE";
+			}
+		}
+
+		// In HQ, follow team that is defending the hq
+		if (level.gametype == "hq" && (level.DefendingRadioTeam == "allies" || level.DefendingRadioTeam == "axis"))
+		{
+			followed_team = level.DefendingRadioTeam;
+			if (level.debug_spectator && followed_team != followed_team_last) printToAutoSpectators("following defending radio team: " + followed_team);
+			level.spectatingSystem_auto_statusText = "STRING_AUTO_SPECTATING_REASON_RADIO_DEFEND";
+		}
+
+		followed_team_last = followed_team;
+
+
+
+		// Possible to change to player from same spectated team
+		follow = false;
+		switch_reason = "";
+		hud_text = "";
+		for(i = 0; i < players.size; i++)
+		{
+			player = players[i];
+			if ((player.pers["team"] == followed_team))
+			{
+				// Player has visible enemy on their screen
+				if (isDefined(player.autospectator_visibleEnemy))
+				{
+					follow = true;
+					switch_reason = "Visible enemy on screen";
+					hud_text = "STRING_AUTO_SPECTATING_REASON_VISIBLE_ENEMY";
+				}
+
+				// Player has visible enemy on their screen
+				if (isDefined(player.spectatingSystem_visibleEnemyInFuture))
+				{
+					follow = true;
+					switch_reason = "Visible enemy on screen in future";
+					hud_text = "STRING_AUTO_SPECTATING_REASON_VISIBLE_ENEMY_IN_FUTURE";
+				}
+
+				// Too long no change, find players very close together to follow
+				if ((gettime() - level.spectatingSystem_lastChange) > 16000)
+				{
+					// Enemy is seeing this player or their screen
+					if (isDefined(player.autospectator_seenByEnemy))
+					{
+						follow = true;
+						switch_reason = "Is visible on enemy screen";
+						hud_text = "STRING_AUTO_SPECTATING_REASON_VISIBLE_BY_ENEMY";
+					}
+					else if (isDefined(player.spectatingSystem_seenByEnemyInFuture))
+					{
+						follow = true;
+						switch_reason = "Is visible on enemy screen in future";
+						hud_text = "STRING_AUTO_SPECTATING_REASON_VISIBLE_BY_ENEMY_IN_FUTURE";
+					}
+					// Player very close to each other (< 800)
+					else if (isDefined(player.autoSpectating_veryCloseToEnemy) && spectated_player != player)
+					{
+						follow = true;
+						switch_reason = "No action - close enemy near by";
+						hud_text = "STRING_AUTO_SPECTATING_REASON_NO_ACTION_NEARBY";
+					}/*
+					else if (player.isMoving)
+					{
+						follow = true;
+						switch_reason = "No action - moving player";
+						hud_text = "STRING_AUTO_SPECTATING_REASON_NO_ACTION_MOVING";
+					}*/
+				}
+
+				if (follow)
+				{
+					level maps\mp\gametypes\_spectating_system::followPlayer(player);
+
+					if (level.debug_spectator) printToAutoSpectators(switch_reason);
+
+					level.spectatingSystem_auto_lockedUntill = gettime() + 8000;
+
+					level.spectatingSystem_auto_statusText = hud_text;
+
+					break;
+				}
+			}
+		}
+	}
+}
diff --git a/source/maps/mp/gametypes/_spectating_hud_damage.gsc b/source/maps/mp/gametypes/_spectating_system_damage.gsc
similarity index 88%
rename from source/maps/mp/gametypes/_spectating_hud_damage.gsc
rename to source/maps/mp/gametypes/_spectating_system_damage.gsc
index d16fa48..187d058 100644
--- a/source/maps/mp/gametypes/_spectating_hud_damage.gsc
+++ b/source/maps/mp/gametypes/_spectating_system_damage.gsc
@@ -2,8 +2,6 @@
 
 init()
 {
-	addEventListener("onPlayerDamaged", 	::onPlayerDamaged); // In readyup show damage info for regular players
-
 	if(game["firstInit"])
 	{
 		precacheString2("STRING_AUTO_SPECTATOR_HIT_HP", 		&"&&1 hp");
@@ -31,28 +29,51 @@ init()
 		precacheString2("STRING_AUTO_SPECTATOR_HIT_SHOTGUN_7p", 	&"7 pellets");
 		precacheString2("STRING_AUTO_SPECTATOR_HIT_SHOTGUN_8p", 	&"8 pellets");
 
-		precacheString2("STRING_AUTO_SPECTATOR_HIT_INFO_SHOTGUN_1_KILL", 	&"Range 1   (1 pellet needed for kill");
+		precacheString2("STRING_AUTO_SPECTATOR_HIT_INFO_SHOTGUN_1_KILL", 	&"Range 1   (1 pellet needed for kill)");
 		precacheString2("STRING_AUTO_SPECTATOR_HIT_INFO_SHOTGUN_1_HIT", 	&"Range 1   (2 pellets needed for kill (body not visible)");
-		precacheString2("STRING_AUTO_SPECTATOR_HIT_INFO_SHOTGUN_2", 		&"Range 2   (2 pellets needed for kill");
-		precacheString2("STRING_AUTO_SPECTATOR_HIT_INFO_SHOTGUN_3", 		&"Range 3   (3 pellets needed for kill");
+		precacheString2("STRING_AUTO_SPECTATOR_HIT_INFO_SHOTGUN_2", 		&"Range 2   (2 pellets needed for kill)");
+		precacheString2("STRING_AUTO_SPECTATOR_HIT_INFO_SHOTGUN_3", 		&"Range 3   (3 pellets needed for kill)");
 		precacheString2("STRING_AUTO_SPECTATOR_HIT_INFO_SHOTGUN_4", 		&"Range 4   (linear damage)");
 		precacheString2("STRING_AUTO_SPECTATOR_HIT_INFO_TORSO_HITBOX_FIX", 	&"Torso hitbox fix applied");
 		precacheString2("STRING_AUTO_SPECTATOR_HIT_INFO_HAND_HITBOX_FIX", 	&"Hand hitbox fix applied");
 
 		precacheShader("headicon_dead");
+
+		game["STRING_SPECTATINGSYSTEM_DAMAGEINFO_ON"] = 		"Hit info ^2On";
+		game["STRING_SPECTATINGSYSTEM_DAMAGEINFO_OFF"] = 		"Hit info ^1Off";
 	}
 
+	addEventListener("onPlayerDamaged", 	::onPlayerDamaged); // In readyup show damage info for regular players
+
 	if (!level.spectatingSystem)
 		return;
 
 	addEventListener("onPlayerKilled", 	::onPlayerKilled);
+	addEventListener("onConnected",  ::onConnected);
+}
+
+onConnected()
+{
+	if (!isDefined(self.pers["spectatingSystem_damageInfo"]))
+		self.pers["spectatingSystem_damageInfo"] = true;
 }
 
 
+toggle()
+{
+	self.pers["spectatingSystem_damageInfo"] = !self.pers["spectatingSystem_damageInfo"];
+
+	if (self.pers["spectatingSystem_damageInfo"])
+		self iprintln(game["STRING_SPECTATINGSYSTEM_DAMAGEINFO_ON"]);
+	else
+		self iprintln(game["STRING_SPECTATINGSYSTEM_DAMAGEINFO_OFF"]);
+}
+
 /*
 Called when player has taken damage.
 self is the player that took damage.
 */
+// Is called even if spectating system is disabled!
 onPlayerDamaged(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime)
 {
 	waittillframeend; // wait untill all hits are processed
@@ -61,9 +82,11 @@ onPlayerDamaged(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon,
 	{
 		// Damage info can be showed in 2 modes:
 		//   - in readyup for regular players
-		//   - for auto-spectators - show info for spectated player
-		if (level.in_readyup ||
-			(level.spectatingSystem && !level.in_readyup && isDefined(level.autoSpectating_spectatedPlayer) && eAttacker == level.autoSpectating_spectatedPlayer))
+		//   - for spectators - show info for spectated player
+		forPlayer = level.in_readyup;
+		forSpectators = level.spectatingSystem && isDefined(level.spectatingSystem_player) && eAttacker == level.spectatingSystem_player;
+
+		if (forPlayer || forSpectators)
 		{
 			self_num = self getEntityNumber();
 			isShotgun = sWeapon == "shotgun_mp" && sMeansOfDeath == "MOD_PISTOL_BULLET";
@@ -74,8 +97,8 @@ onPlayerDamaged(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon,
 
 			adjustedBy = eAttacker.hitData[self_num].adjustedBy;
 
-			// In readyup for regular players
-			if (level.in_readyup)
+			// In readyup show for regular players
+			if (forPlayer)
 			{
 				// For shotgun show accumulated damage
 				if (isShotgun) 	damage = eAttacker.hitData[self_num].damage_comulated;
@@ -83,16 +106,17 @@ onPlayerDamaged(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon,
 
 				eAttacker thread showDamageInfoReadyup(damage, sHitLoc, sMeansOfDeath, pellets, adjustedBy);
 			}
-			else // For auto-spactators
+
+			// Show to all spectators
+			if (forSpectators)
 			{
 				damage = eAttacker.hitData[self_num].damage_comulated;
 
-				// Show to all spectators
 				players = getentarray("player", "classname");
 				for(i = 0; i < players.size; i++)
 				{
 					player = players[i];
-					if (player.pers["team"] == "spectator" && player.pers["autoSpectating"] && !isDefined(player.killcam))
+					if (player.pers["team"] == "streamer" && player.spectatingSystem_turnedOn && player.pers["spectatingSystem_damageInfo"] && !isDefined(player.killcam))
 					{
 						player thread showDamageInfo(damage, sHitLoc, sMeansOfDeath, pellets, adjustedBy);
 					}
@@ -101,10 +125,8 @@ onPlayerDamaged(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon,
 		}
 	}
 
-	if (!level.spectatingSystem)
-		return;
-
-	if (isDefined(level.autoSpectating_spectatedPlayer) && self == level.autoSpectating_spectatedPlayer && !level.in_readyup)
+	// Show taken damage
+	if (level.spectatingSystem && isDefined(level.spectatingSystem_player) && self == level.spectatingSystem_player && !level.in_readyup)
 	{
 		damage = iDamage;
 		if (isDefined(eAttacker) && isPlayer(eAttacker))
@@ -118,7 +140,7 @@ onPlayerDamaged(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon,
 		for(i = 0; i < players.size; i++)
 		{
 			player = players[i];
-			if (player.pers["team"] == "spectator" && player.pers["autoSpectating"] && !isDefined(player.killcam))
+			if (player.pers["team"] == "streamer" && player.spectatingSystem_turnedOn && player.pers["spectatingSystem_damageInfo"] && !isDefined(player.killcam))
 			{
 				player thread showTakenDamageInfo(damage, sHitLoc, sMeansOfDeath);
 			}
@@ -132,14 +154,14 @@ self is the player that was killed.
 */
 onPlayerKilled(eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration)
 {
-	if (isDefined(eAttacker) && isPlayer(eAttacker) && self != eAttacker && isDefined(level.autoSpectating_spectatedPlayer) && eAttacker == level.autoSpectating_spectatedPlayer && !level.in_readyup)
+	if (isDefined(eAttacker) && isPlayer(eAttacker) && self != eAttacker && isDefined(level.spectatingSystem_player) && eAttacker == level.spectatingSystem_player && !level.in_readyup)
 	{
 		// Show to all spectators
 		players = getentarray("player", "classname");
 		for(i = 0; i < players.size; i++)
 		{
 			player = players[i];
-			if (player.pers["team"] == "spectator" && player.pers["autoSpectating"])
+			if (player.pers["team"] == "streamer" && player.spectatingSystem_turnedOn && player.pers["spectatingSystem_damageInfo"] && !isDefined(player.killcam))
 			{
 				player thread showKillInfo();
 			}
@@ -220,15 +242,16 @@ showDamageInfo(damage, sHitLoc, sMeansOfDeath, pellets, adjustedBy)
 	self.hud_damageinfo.color = (r, g, b);
 	self.hud_damageinfo_loc.color = (1, 1, 1);
 
-	self.hud_damageinfo.y = 120;
+	self.hud_damageinfo.y = 115;
 	self.hud_damageinfo.alpha = 1;
-	self.hud_damageinfo_loc.y = 120;
+	self.hud_damageinfo_loc.y = 115;
 	self.hud_damageinfo_loc.alpha = 1;
 
+	// Move up slowly
 	self.hud_damageinfo moveovertime(3);
-	self.hud_damageinfo.y = 100;
+	self.hud_damageinfo.y = 105;
 	self.hud_damageinfo_loc moveovertime(3);
-	self.hud_damageinfo_loc.y = 100;
+	self.hud_damageinfo_loc.y = 105;
 
 	wait level.fps_multiplier * 1;
 
@@ -288,7 +311,7 @@ showDamageInfoReadyup(damage, sHitLoc, sMeansOfDeath, pellets, adjustedBy)
 		self.hud_damageinfo.vertAlign = "middle";
 		self.hud_damageinfo.alignX = "left";
 		self.hud_damageinfo.label = game["STRING_AUTO_SPECTATOR_HIT_HP"];
-		self.hud_damageinfo.x = -40;
+		self.hud_damageinfo.x = -44;
 		self.hud_damageinfo.fontscale = 1.1;
 		self.hud_damageinfo.archived = false;
 	}
@@ -299,7 +322,7 @@ showDamageInfoReadyup(damage, sHitLoc, sMeansOfDeath, pellets, adjustedBy)
 		self.hud_damageinfo_loc.horzAlign = "center";
 		self.hud_damageinfo_loc.vertAlign = "middle";
 		self.hud_damageinfo_loc.alignX = "right";
-		self.hud_damageinfo_loc.x = 40;
+		self.hud_damageinfo_loc.x = 42;
 		self.hud_damageinfo_loc.fontscale = 1.1;
 		self.hud_damageinfo_loc.archived = false;
 	}
@@ -438,11 +461,12 @@ showTakenDamageInfo(iDamage, sHitLoc, sMeansOfDeath)
 	self.hud_takendamageinfo.color = (r, g, b);
 	self.hud_takendamageinfo_loc.color = (1, 1, 1);
 
-	self.hud_takendamageinfo.y = 120;
+	self.hud_takendamageinfo.y = 130;
 	self.hud_takendamageinfo.alpha = 1;
-	self.hud_takendamageinfo_loc.y = 120;
+	self.hud_takendamageinfo_loc.y = 130;
 	self.hud_takendamageinfo_loc.alpha = 1;
 
+	// Move down slowly
 	self.hud_takendamageinfo moveovertime(3);
 	self.hud_takendamageinfo.y = 140;
 	self.hud_takendamageinfo_loc moveovertime(3);
@@ -485,10 +509,12 @@ showKillInfo()
 		self.hud_damageinfo_kill setShader("headicon_dead", 23, 23);
 	}
 
-	self.hud_damageinfo_kill.y = 120 - 2;
+	self.hud_damageinfo_kill.y = 115 - 2;
 	self.hud_damageinfo_kill.alpha = 1;
+
+	// Move up slowly
 	self.hud_damageinfo_kill moveovertime(3);
-	self.hud_damageinfo_kill.y = 100 - 2;
+	self.hud_damageinfo_kill.y = 105 - 2;
 
 	wait level.fps_multiplier * 1;
 
diff --git a/source/maps/mp/gametypes/_spectating_system_hud.gsc b/source/maps/mp/gametypes/_spectating_system_hud.gsc
new file mode 100644
index 0000000..c71ea82
--- /dev/null
+++ b/source/maps/mp/gametypes/_spectating_system_hud.gsc
@@ -0,0 +1,546 @@
+#include maps\mp\gametypes\global\_global;
+
+init()
+{
+	if (!level.spectatingSystem)
+		return;
+
+	if(game["firstInit"])
+	{
+		precacheString2("STRING_SPECTATINGSYSTEM_PRESS_ATTACT_TO_ENABLE", &"Press ^3[{+attack}]^7 to activate spectating system");
+		precacheString2("STRING_SPECTATINGSYSTEM_PRESS_ESC_WARNING", &"Press ^3[ESC]^7 to close spectating system\n(binds are not working when spectating system is opened)");
+	}
+
+	if (!isDefined(game["spectatingSystem_scoreProgress"]))
+		game["spectatingSystem_scoreProgress"] = [];
+
+	level.spectatingSystem_boxesLeft_players = [];
+	level.spectatingSystem_boxesRight_players = [];
+
+	addEventListener("onConnected",  	::onConnected);
+}
+
+onConnected()
+{
+	if (!isDefined(self.pers["spectatingSystem_keysVisible"]))
+		self.pers["spectatingSystem_keysVisible"] = false;
+}
+
+keys_help()
+{
+	self endon("disconnect");
+
+	self keys_show();
+
+	self endon("spectatingSystem_keysVisible");
+
+	wait level.fps_multiplier * 5;
+
+	self keys_hide();
+}
+
+keys_toggle()
+{
+	// Already hided
+	if (!self.pers["spectatingSystem_keysVisible"])
+		self keys_show();
+	else
+		self keys_hide();
+}
+
+keys_show()
+{
+	self.pers["spectatingSystem_keysVisible"] = true;
+	self setClientCvar2("ui_spectatorsystem_keys", "1");
+	self notify("spectatingSystem_keysVisible", 1);
+}
+
+keys_hide()
+{
+	self.pers["spectatingSystem_keysVisible"] = false;
+	self setClientCvar2("ui_spectatorsystem_keys", "0");
+	self notify("spectatingSystem_keysVisible", 0);
+}
+
+
+
+
+HUD_KeysWelcome_show()
+{
+	self setClientCvar2("ui_spectatorsystem_keysWelcome", "1");
+}
+
+HUD_KeysWelcome_hide()
+{
+	self setClientCvar2("ui_spectatorsystem_keysWelcome", "0");
+}
+
+
+
+
+HUD_ActivateSpectatingSystem_show()
+{
+	if (!isDefined(self.spectatingSystem_HUD_enableBG))
+	{
+		self.spectatingSystem_HUD_enableBG = addHUDClient(self, -100, 135, undefined, (1,1,1), "left", "top", "center", "middle");
+	    	self.spectatingSystem_HUD_enableBG setShader("black", 200, 20);
+		self.spectatingSystem_HUD_enableBG.archived = false;
+		//self.spectatingSystem_HUD_enableBG.sort =
+	        self.spectatingSystem_HUD_enableBG.alpha = 0.75;
+	}
+	if (!isDefined(self.spectatingSystem_HUD_enable))
+	{
+	        self.spectatingSystem_HUD_enable = addHUDClient(self, 0, 141, 0.8, (1,1,1), "center", "top", "center", "middle");
+		self.spectatingSystem_HUD_enable.archived = false;
+		self.spectatingSystem_HUD_enable setText(game["STRING_SPECTATINGSYSTEM_PRESS_ATTACT_TO_ENABLE"]);
+	}
+
+	self HUD_CloseMenuWarning_destroy();
+}
+
+HUD_ActivateSpectatingSystem_hide()
+{
+	if (isDefined(self.spectatingSystem_HUD_enableBG))
+	{
+		self.spectatingSystem_HUD_enableBG destroy2();
+		self.spectatingSystem_HUD_enableBG = undefined;
+	}
+	if (isDefined(self.spectatingSystem_HUD_enable))
+	{
+	        self.spectatingSystem_HUD_enable destroy2();
+		self.spectatingSystem_HUD_enable = undefined;
+	}
+}
+
+
+
+
+HUD_CloseMenuWarning_show()
+{
+	self endon("disconnect");
+
+	self notify("spectatingSystem_HUD_closeMenuWarningBG");
+	self endon("spectatingSystem_HUD_closeMenuWarningBG");
+
+	if (!isDefined(self.spectatingSystem_HUD_closeMenuWarningBG))
+	{
+		self.spectatingSystem_HUD_closeMenuWarningBG = addHUDClient(self, -150, 135, undefined, (1,1,1), "left", "top", "center", "middle");
+	    	self.spectatingSystem_HUD_closeMenuWarningBG setShader("black", 300, 23);
+		self.spectatingSystem_HUD_closeMenuWarningBG.archived = false;
+	}
+	if (!isDefined(self.spectatingSystem_HUD_closeMenuWarning))
+	{
+	        self.spectatingSystem_HUD_closeMenuWarning = addHUDClient(self, 0, 137, 0.8, (1,1,1), "center", "top", "center", "middle");
+		self.spectatingSystem_HUD_closeMenuWarning.archived = false;
+		self.spectatingSystem_HUD_closeMenuWarning setText(game["STRING_SPECTATINGSYSTEM_PRESS_ESC_WARNING"]);
+	}
+
+	self.spectatingSystem_HUD_closeMenuWarning.alpha = 1;
+
+	for (i = 0; i < 3; i++)
+	{
+		self.spectatingSystem_HUD_closeMenuWarningBG.alpha = 0.75;
+
+		wait level.fps_multiplier * 0.1;
+		if (!isDefined(self.spectatingSystem_HUD_closeMenuWarningBG) || !isDefined(self.spectatingSystem_HUD_closeMenuWarning)) return;
+
+		self.spectatingSystem_HUD_closeMenuWarningBG.alpha = 0.5;
+
+		wait level.fps_multiplier * 0.1;
+		if (!isDefined(self.spectatingSystem_HUD_closeMenuWarningBG) || !isDefined(self.spectatingSystem_HUD_closeMenuWarning)) return;
+	}
+
+	self.spectatingSystem_HUD_closeMenuWarningBG.alpha = 0.75;
+	self.spectatingSystem_HUD_closeMenuWarning.alpha = 1;
+
+	wait level.fps_multiplier * 0.5;
+	if (!isDefined(self.spectatingSystem_HUD_closeMenuWarningBG) || !isDefined(self.spectatingSystem_HUD_closeMenuWarning)) return;
+
+	self.spectatingSystem_HUD_closeMenuWarningBG FadeOverTime(.5);
+	self.spectatingSystem_HUD_closeMenuWarning FadeOverTime(.5);
+	self.spectatingSystem_HUD_closeMenuWarningBG.alpha = 0;
+	self.spectatingSystem_HUD_closeMenuWarning.alpha = 0;
+
+	wait level.fps_multiplier * .5;
+
+	self HUD_CloseMenuWarning_destroy();
+}
+
+HUD_CloseMenuWarning_destroy()
+{
+	if (isDefined(self.spectatingSystem_HUD_closeMenuWarningBG))
+	{
+		self.spectatingSystem_HUD_closeMenuWarningBG destroy2();
+		self.spectatingSystem_HUD_closeMenuWarningBG = undefined;
+	}
+	if (isDefined(self.spectatingSystem_HUD_closeMenuWarning))
+	{
+	        self.spectatingSystem_HUD_closeMenuWarning destroy2();
+		self.spectatingSystem_HUD_closeMenuWarning = undefined;
+	}
+
+}
+
+
+
+
+hide_player_boxes()
+{
+	self endon("disconnect");
+	self endon("spectatingSystem_bars_updated");
+
+	// Hide from top to bottom
+	for (i = 4; i >= 0; i--)
+	{
+		self setClientCvarIfChanged("ui_spectatingsystem_team1_player"+i+"_health", "");
+		self setClientCvarIfChanged("ui_spectatingsystem_team2_player"+i+"_health", "");
+
+		self setClientCvarIfChanged("ui_spectatingsystem_team1_player"+i+"_text", "");
+		self setClientCvarIfChanged("ui_spectatingsystem_team2_player"+i+"_text", "");
+
+		self setClientCvarIfChanged("ui_spectatingsystem_team1_player"+i+"_info", "");
+		self setClientCvarIfChanged("ui_spectatingsystem_team2_player"+i+"_info", "");
+
+		self setClientCvarIfChanged("ui_spectatingsystem_team1_player"+i+"_icons", "");
+		self setClientCvarIfChanged("ui_spectatingsystem_team2_player"+i+"_icons", "");
+
+		//wait level.fps_multiplier * 0.05; // 0.5s total
+
+	}
+
+	wait level.fps_multiplier * 0.2;
+
+	self setClientCvarIfChanged("ui_spectatingsystem_team1_scoreProgress", "");
+	self setClientCvarIfChanged("ui_spectatingsystem_team2_scoreProgress", "");
+
+	self setClientCvarIfChanged("ui_spectatingsystem_playerProgress", "");
+}
+
+
+ScoreProgress_AddWinner(winner)
+{
+	if (!level.spectatingSystem) return;
+
+	teamLeft = "allies";
+	teamRight = "axis";
+
+	// If match info is enabled, ensure teams are in correct sides
+	if (game["scr_matchinfo"] == 1 || game["scr_matchinfo"] == 2)
+	{
+		if (game["match_team1_side"] == "axis")
+		{
+			teamLeft = "axis";
+			teamRight = "allies";
+		}
+	}
+
+	team = 0; // draw
+	if (winner == "allies" && teamLeft == "allies") team = 1; // team left
+	if (winner == "allies" && teamRight == "allies") team = 2; // team right
+	if (winner == "axis" && teamLeft == "axis") team = 1; // team left
+	if (winner == "axis" && teamRight == "axis") team = 2; // team right
+
+	game["spectatingSystem_scoreProgress"][game["spectatingSystem_scoreProgress"].size] = team;
+}
+
+ScoreProgress_AddHalftime()
+{
+	if (!level.spectatingSystem) return;
+	game["spectatingSystem_scoreProgress"][game["spectatingSystem_scoreProgress"].size] = 3; // halftime
+}
+
+ScoreProgress_AddTimeout()
+{
+	if (!level.spectatingSystem) return;
+	game["spectatingSystem_scoreProgress"][game["spectatingSystem_scoreProgress"].size] = 4; // timeout
+}
+
+ScoreProgress_AddOvertime()
+{
+	if (!level.spectatingSystem) return;
+	game["spectatingSystem_scoreProgress"][game["spectatingSystem_scoreProgress"].size] = 5; // overtime
+}
+
+
+
+HUD_PlayerBoxes_Loop()
+{
+	self endon("disconnect");
+
+	wait level.frame;
+
+	teamLeft = "allies";
+	teamRight = "axis";
+
+	// If match info is enabled, ensure teams are in correct sides
+	if (game["scr_matchinfo"] == 1 || game["scr_matchinfo"] == 2)
+	{
+		if (game["match_team1_side"] == "axis")
+		{
+			teamLeft = "axis";
+			teamRight = "allies";
+		}
+	}
+
+
+	for(;;)
+	{
+		wait level.fps_multiplier * 0.1;
+
+		if (self.pers["team"] == "streamer")
+		{
+			// Hide for a while
+			if (isDefined(self.killcam) || level.in_readyup || game["state"] == "intermission") // readyup in case timeout is called
+			{
+				self thread hide_player_boxes();
+				continue;
+			}
+
+
+			if (game["spectatingSystem_scoreProgress"].size > 0)
+			{
+				str = "";
+				for (i = 0; i < game["spectatingSystem_scoreProgress"].size; i++)
+				{
+					code = game["spectatingSystem_scoreProgress"][i];
+					if (code == 0) // Draw
+						str += "^7-";
+					else if (code == 1) // team left winner
+					{
+						if (teamLeft == "allies") str += "^4#"; // blue
+						if (teamLeft == "axis") str += "^1#"; // red
+					}
+					else if (code == 2) // team right winner
+					{
+						if (teamRight == "allies") str += "^4#"; // blue
+						if (teamRight == "axis") str += "^1#"; // red
+					}
+					else if (code == 3) // halftime
+					{
+						str += "^7|";
+					}
+					else if (code == 4) // timeout
+					{
+						str += "^7[T]";
+					}
+					else if (code == 5) // overtime
+					{
+						str += "^7 [O] ";
+					}
+
+				}
+
+				self notify("spectatingSystem_bars_updated");
+				self setClientCvarIfChanged("ui_spectatingsystem_team1_scoreProgress", "Score progress:");
+				self setClientCvarIfChanged("ui_spectatingsystem_team2_scoreProgress", str);
+			}
+
+
+
+			playerProgress = "";
+			if (level.gametype == "sd" && isDefined(level.player_alive_history) && level.player_alive_history != "")
+				playerProgress = "Players:" + level.player_alive_history;
+
+			self notify("spectatingSystem_bars_updated");
+			self setClientCvarIfChanged("ui_spectatingsystem_playerProgress", playerProgress);
+
+
+
+
+
+			level.spectatingSystem_boxesLeft_players = getPlayersByTeam(teamLeft);
+			level.spectatingSystem_boxesRight_players = getPlayersByTeam(teamRight);
+
+			// Fill bars
+			for(r = 0; r < 5; r++)
+			{
+				if (r < level.spectatingSystem_boxesLeft_players.size)
+					self fill_box(r, "left", teamLeft, level.spectatingSystem_boxesLeft_players[r]);
+				else
+					self unfill_box(r, "left");
+
+				if (r < level.spectatingSystem_boxesRight_players.size)
+					self fill_box(r, "right", teamRight, level.spectatingSystem_boxesRight_players[r]);
+				else
+					self unfill_box(r, "right");
+			}
+
+		}
+		else
+		{
+			// Player left spectators
+			// Hide hud elements
+			self thread hide_player_boxes();
+			return;
+		}
+	}
+}
+
+
+followPlayerByNum(num)
+{
+	if (num < 1 || num > 10) return;
+
+	player = undefined;
+	if (num >= 1 && num <= 5)
+	{
+		if ((num - 1) < level.spectatingSystem_boxesLeft_players.size)
+			player = level.spectatingSystem_boxesLeft_players[num - 1];
+	}
+
+	if (num >= 6 && num <= 10)
+	{
+		if ((num - 6) < level.spectatingSystem_boxesRight_players.size)
+			player = level.spectatingSystem_boxesRight_players[num - 6];
+	}
+
+	if (isDefined(player))
+	{
+		if (player.sessionstate == "playing")
+		{
+			level maps\mp\gametypes\_spectating_system::followPlayer(player);
+			level maps\mp\gametypes\_spectating_system_auto::lockFor(30000); // Lock selected player for 30 secods
+			self iprintln("Follow player " + num/* + ": " + player.name*/);
+		}
+		else
+			self iprintln("^3Player " + num + " is not alive");
+	}
+	else
+		self iprintln("^3Player " + num + " does not exists");
+}
+
+
+getPlayersByTeam(teamname)
+{
+	playersFiltered = [];
+	index = 0;
+	players = getentarray("player", "classname");
+	for(i = 0; i < players.size; i++)
+	{
+		player = players[i];
+
+		if (!isDefined(teamname) || player.pers["team"] == teamname)
+		{
+			playersFiltered[index] = player;
+			index++;
+		}
+	}
+
+	// Sort and return
+	return playersFiltered;
+}
+
+
+fill_box(index, barSide, teamname, player)
+{
+	teamNum = "1";
+	if (barSide == "right")
+		teamNum = "2";
+
+	health = "";
+	// Because health is showed via menu elements, the health bar is splited only into a few sizes
+	// So according to helth we select most corresponding size
+	if (player.health <= 0)
+		health =  "0";
+
+	else if (player.health < 20)
+		health =  "10";
+
+	else if (player.health < 70)
+		health =  "50";
+
+	else if (player.health < 99)
+		health =  "80";
+
+	else
+		health =  "100";
+
+	// Health also contains apended info about color
+	if (player.health > 0)
+	{
+	      	if (teamname == "allies")
+			health = health + "_blue";
+		else
+			health = health + "_red";
+	}
+
+
+	if (self.spectatingSystem_turnedOn && isDefined(level.spectatingSystem_player) && player == level.spectatingSystem_player)
+	{
+		health = health + "_"; // underscore means this player is followed and rectangle around player box is showed
+	}
+
+
+
+	// Number of player
+	keyNum = "";
+	if (self.pers["spectatingSystem_keysVisible"])
+	{
+		if (barSide == "left")	keyNum = "" + (index + 1) + "|  ";
+		else if (index == 4)	keyNum = "0|  "; // 10
+		else			keyNum = "" + (index + 6) + "|  ";
+	}
+
+	// Weapon names
+	weapon1 = player getweaponslotweapon("primary");
+    	weapon2 = player getweaponslotweapon("primaryb");
+	weapon1 = maps\mp\gametypes\_weapons::getWeaponName2(weapon1);
+	weapon2 = maps\mp\gametypes\_weapons::getWeaponName2(weapon2);
+	if (weapon2 == "none")
+		weapon2 = "-";
+	weapon_text = "";
+	if (player.health > 0)
+		weapon_text = weapon1 + " / " + weapon2;
+
+
+
+	/* Icons
+	Combinations:
+		"" 		- no icons
+		"grenade" 	- show grenade icon
+		"grenade2" 	- show multi-grenade icons
+		"smoke" 	- show smoke icon
+		"grenade_smoke" - show grenade and smoke icons
+		"grenade2_smoke" - show multi-grenade and smoke icons
+	*/
+	icons = "";
+	if (player.health > 0)
+	{
+		grenades = player maps\mp\gametypes\_weapons::getFragGrenadeCount();
+		smokes = player maps\mp\gametypes\_weapons::getSmokeGrenadeCount();
+
+		if (grenades >= 2)
+			icons += "grenade2";
+		else if (grenades == 1)
+			icons += "grenade";
+
+		if (smokes > 0)
+		{
+			if (icons != "")
+				icons += "_";
+			icons += "smoke";
+		}
+	}
+
+
+	self notify("spectatingSystem_bars_updated");
+	self setClientCvarIfChanged("ui_spectatingsystem_team"+teamNum+"_player"+index+"_health", 	health);
+	self setClientCvarIfChanged("ui_spectatingsystem_team"+teamNum+"_player"+index+"_text", 	keyNum + player.name);
+	self setClientCvarIfChanged("ui_spectatingsystem_team"+teamNum+"_player"+index+"_info", 	player.score + " / " + player.deaths + "        " + weapon_text);
+	self setClientCvarIfChanged("ui_spectatingsystem_team"+teamNum+"_player"+index+"_icons", 	icons);
+}
+
+
+unfill_box(index, barSide)
+{
+	teamNum = "1";
+	if (barSide == "right")
+		teamNum = "2";
+
+	// Text does not need to be updated, because is hided automatically if healht is empty
+	//setClientCvarIfChanged("ui_spectatingsystem_team"+teamNum+"_player"+index+"_text", "");
+
+	self notify("spectatingSystem_bars_updated");
+	self setClientCvarIfChanged("ui_spectatingsystem_team"+teamNum+"_player"+index+"_health", "");
+	self setClientCvarIfChanged("ui_spectatingsystem_team"+teamNum+"_player"+index+"_icons", "");
+}
diff --git a/source/maps/mp/gametypes/_spectating_killcam.gsc b/source/maps/mp/gametypes/_spectating_system_killcam.gsc
similarity index 63%
rename from source/maps/mp/gametypes/_spectating_killcam.gsc
rename to source/maps/mp/gametypes/_spectating_system_killcam.gsc
index 6206bab..af55903 100644
--- a/source/maps/mp/gametypes/_spectating_killcam.gsc
+++ b/source/maps/mp/gametypes/_spectating_system_killcam.gsc
@@ -2,57 +2,43 @@
 
 init()
 {
-	addEventListener("onSpawnedPlayer", ::onSpawnedPlayer);
-
 	if (!level.spectatingSystem)
 		return;
 
 	if(game["firstInit"])
 	{
-		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_MULTIKILL", &"Press ^3[{+activate}]^7 to play ^2multikill ^7 of:");
-		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_MULTIKILL_2", &"Press ^3[{+activate}]^7 to play ^22 kills ^7 of:");
-		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_MULTIKILL_3", &"Press ^3[{+activate}]^7 to play ^23 kills ^7 of:");
-		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_MULTIKILL_4", &"Press ^3[{+activate}]^7 to play ^24 kills ^7 of:");
-		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_MULTIKILL_5", &"Press ^3[{+activate}]^7 to play ^25 kills ^7 of:");
-		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_NOZOOM", &"Press ^3[{+activate}]^7 to play ^2noozom ^7 of:");
-		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_BASH", &"Press ^3[{+activate}]^7 to play ^2bash ^7 of:");
+		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_MULTIKILL", &"Press ^3[F]^7 to play ^2multikill ^7 of:");
+		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_MULTIKILL_2", &"Press ^3[F]^7 to play ^22 kills ^7 of:");
+		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_MULTIKILL_3", &"Press ^3[F]^7 to play ^23 kills ^7 of:");
+		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_MULTIKILL_4", &"Press ^3[F]^7 to play ^24 kills ^7 of:");
+		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_MULTIKILL_5", &"Press ^3[F]^7 to play ^25 kills ^7 of:");
+		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_NOZOOM", &"Press ^3[F]^7 to play ^2noozom ^7 of:");
+		precacheString2("STRING_AUTO_SPECTATOR_KILLCAM_PROPOSAL_KEY_BASH", &"Press ^3[F]^7 to play ^2bash ^7 of:");
+
+		precacheString2("STRING_SPECTATINGSYSTEM_KILLCAM_REPLAY", &"Spectator killcam replay");
 	}
 
 
-	level.autoSpectating_kills = [];
-	level.autoSpectating_killcamProposingTime = 6;		// in seconds
-	level.autoSpectating_intenseSituation = false;
+	level.spectatingSystem_killcam_kills = [];
+	level.spectatingSystem_killcam_proposingTime = 6;		// in seconds
+	level.spectatingSystem_killcam_intenseSituation = false;
 
 	level thread watchIntenseSituation();
 
 	addEventListener("onConnected",  ::onConnected);
 	addEventListener("onPlayerKilled",  ::onPlayerKilled);
         addEventListener("onMenuResponse",  ::onMenuResponse);
-	addEventListener("onSpawnedSpectator",  ::onSpawnedSpectator);
 }
 
 onConnected()
 {
-	self.autoSpectating_killIndexes = [];
-	self.autoSpectating_killcamProposingVisible = false;
-
-	if (!level.in_readyup)
-	{
-		spectMenuSetRows(); // set No record to play!
-	}
-}
+	self.spectatingSystem_killcam_indexes = [];
+	self.spectatingSystem_killcam_proposingVisible = false;
 
-onSpawnedPlayer()
-{
-	// We have to make sure that this cvar is defined, otherwise quickmessages menu will not work
-	self setClientCvar2("ui_quickmessage_spectatormode", "0");
-}
-
-onSpawnedSpectator()
-{
+	if (self.pers["team"] == "streamer")
+		self HUD_SetRowsInMenu(); // set "No record to play!"
 }
 
-
 /*
 Called when command scriptmenuresponse is executed on client side
 self is player that called scriptmenuresponse
@@ -62,18 +48,18 @@ onMenuResponse(menu, response)
 {
 	if (menu == game["menu_spectatingsystem"])
 	{
-		if (response == "menu_open")
+		if (response == "killcam_open")
 		{
-			self thread maps\mp\gametypes\_spectating_hud::keys_show();
+			self HUD_SetRowsInMenu();
+
+			return true;
 		}
-		else if (response == "menu_close")
+		else if (response == "killcam_close")
 		{
-			self thread maps\mp\gametypes\_spectating_hud::keys_hide();
+			return true;
 		}
 		else
 		{
-			self thread maps\mp\gametypes\_spectating_hud::keys_hide();
-
 			i = -1;
 	    		switch(response)
 			{
@@ -89,24 +75,23 @@ onMenuResponse(menu, response)
 				case "killcam_0": i = 9; break;
 			}
 
-			if (i > -1 && i < self.autoSpectating_killIndexes.size)
-				replayAction(self.autoSpectating_killIndexes[i], true);
-			else
-				self iprintln("^1Not existing record");
-		}
+			if (i > -1)
+			{
+				if (i < self.spectatingSystem_killcam_indexes.size)
+					replayAction(self.spectatingSystem_killcam_indexes[i], true);
+				else
+					self iprintln("^1Not existing record");
 
-		return true;
+				return true;
+			}
+		}
 	}
 }
 
 
 onPlayerKilled(eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, timeOffset, deathAnimDuration)
 {
-	// No one in auto-spectator mode
-	if (!level.autoSpectating_do)
-		return;
-
-	save = (level.gametype == "sd" && level.roundstarted && !level.roundended) || (level.gametype != "sd" && level.matchstarted && !level.mapended);
+	save = (level.gametype == "sd" && !level.in_readyup && level.roundstarted && !level.roundended) || (level.gametype != "sd" && level.matchstarted && !level.mapended);
 
 	if (isDefined(eAttacker) && isPlayer(eAttacker) && eAttacker != self && save)
 	{
@@ -115,7 +100,7 @@ onPlayerKilled(eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHi
 		killRecord.time = gettime();
 		killRecord.timeFirst = killRecord.time;
 		killRecord.kills = 1;
-		killRecord.fullyFollowedBySpectator = isDefined(level.autoSpectating_spectatedPlayer) && eAttacker == level.autoSpectating_spectatedPlayer;
+		killRecord.fullyFollowedBySpectator = isDefined(level.spectatingSystem_player) && eAttacker == level.spectatingSystem_player;
 		killRecord.followedKillsBySpectator = killRecord.fullyFollowedBySpectator * 1; // how many kills were watched by spectator
 		killRecord.nozoom = (eAttacker playerAds() == 0) && (distance(eAttacker.origin, self.origin) > 800) && (sMeansOfDeath != "MOD_GRENADE_SPLASH") && sWeapon != "mg42_bipod_stand_mp" && sWeapon != "30cal_stand_mp";
 		killRecord.bash = sMeansOfDeath == "MOD_MELEE";
@@ -124,9 +109,9 @@ onPlayerKilled(eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHi
 		killRecord.lastKill = (level.gametype == "sd" && level.exist[self.pers["team"]] == 1);
 		killRecord.deleted = false;
 
-		for (i = level.autoSpectating_kills.size-1; i >= 0; i--)
+		for (i = level.spectatingSystem_killcam_kills.size-1; i >= 0; i--)
 		{
-			lastRecord = level.autoSpectating_kills[i];
+			lastRecord = level.spectatingSystem_killcam_kills[i];
 
 			if (lastRecord.deleted) continue;
 
@@ -137,24 +122,24 @@ onPlayerKilled(eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHi
 			// Find record with the same guy
 			if (isDefined(lastRecord.player) && lastRecord.player == eAttacker)
 			{
-				killRecord.fullyFollowedBySpectator = killRecord.fullyFollowedBySpectator && level.autoSpectating_kills[i].fullyFollowedBySpectator;
-				killRecord.followedKillsBySpectator += level.autoSpectating_kills[i].followedKillsBySpectator;
-				killRecord.nozoom = killRecord.nozoom || level.autoSpectating_kills[i].nozoom;
-				killRecord.bash = killRecord.bash || level.autoSpectating_kills[i].bash;
-				killRecord.grenade = level.autoSpectating_kills[i].grenade;	// first kill was grenade (need more time)
-				killRecord.lastKill = killRecord.lastKill || level.autoSpectating_kills[i].lastKill;
-				killRecord.timeFirst = level.autoSpectating_kills[i].timeFirst;
-				killRecord.kills += level.autoSpectating_kills[i].kills;
+				killRecord.fullyFollowedBySpectator = killRecord.fullyFollowedBySpectator && level.spectatingSystem_killcam_kills[i].fullyFollowedBySpectator;
+				killRecord.followedKillsBySpectator += level.spectatingSystem_killcam_kills[i].followedKillsBySpectator;
+				killRecord.nozoom = killRecord.nozoom || level.spectatingSystem_killcam_kills[i].nozoom;
+				killRecord.bash = killRecord.bash || level.spectatingSystem_killcam_kills[i].bash;
+				killRecord.grenade = level.spectatingSystem_killcam_kills[i].grenade;	// first kill was grenade (need more time)
+				killRecord.lastKill = killRecord.lastKill || level.spectatingSystem_killcam_kills[i].lastKill;
+				killRecord.timeFirst = level.spectatingSystem_killcam_kills[i].timeFirst;
+				killRecord.kills += level.spectatingSystem_killcam_kills[i].kills;
 
-				level.autoSpectating_kills[i].deleted = true;
+				level.spectatingSystem_killcam_kills[i].deleted = true;
 
 				break;
 			}
 		}
 
 		// Add new
-		id = level.autoSpectating_kills.size;
-		level.autoSpectating_kills[level.autoSpectating_kills.size] = killRecord;
+		id = level.spectatingSystem_killcam_kills.size;
+		level.spectatingSystem_killcam_kills[level.spectatingSystem_killcam_kills.size] = killRecord;
 
 		level thread potencialAutoKillcam(id);
 	}
@@ -162,9 +147,26 @@ onPlayerKilled(eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHi
 
 potencialAutoKillcam(killId)
 {
-	record = level.autoSpectating_kills[killId];
+	record = level.spectatingSystem_killcam_kills[killId];
+
+	// Is this action interesting to watch
+	isInterestingAction = (record.kills >= 2 || record.nozoom || record.bash);
+
+	// If bomb is planted, replay last kill only if there is enught time
+	replayLastKill = true;
+	if(record.lastKill && level.gametype == "sd")
+	{
+		if (level.bombplanted)
+		{
+			remaining = level.bombtimer - (gettime() - level.bombtimerstart) / 1000; // decimal seconds
+			if (remaining < 25)
+				replayLastKill = false;
+		}
+	}
+
 
-	if (record.lastKill && !record.fullyFollowedBySpectator)
+	// Replay last kill if it was not fully spectated, or if it was interesting action (even if it was already replayed)
+	if (record.lastKill && replayLastKill && (!record.fullyFollowedBySpectator || isInterestingAction))
 	{
 		wait level.fps_multiplier * 1.5;
 
@@ -174,14 +176,14 @@ potencialAutoKillcam(killId)
 		return;
 	}
 
-	if ((record.kills >= 2 || record.nozoom || record.bash) && !record.fullyFollowedBySpectator)
+	if (isInterestingAction)
 	{
 		// Replay action for all spectators
 		players = getentarray("player", "classname");
 		for(i = 0; i < players.size; i++)
 		{
 			player = players[i];
-			if (player.pers["team"] == "spectator" && player.pers["autoSpectating"])
+			if (player.pers["team"] == "streamer" && player.spectatingSystem_turnedOn)
 			{
 				player thread potencialAutoKillcamForPlayer(killId);
 			}
@@ -197,11 +199,14 @@ potencialAutoKillcamForPlayer(killId)
 	// If player kills another enemy, this record is deleted, this thread ends and new thread is created
 	time_killer_no_enemy = 0;
 	time_spectated_no_enemy = 0;
-	record = level.autoSpectating_kills[killId];
+	record = level.spectatingSystem_killcam_kills[killId];
 	for(;;)
 	{
 		wait level.frame;
 
+		if (self.pers["team"] != "streamer")
+			break;
+
 		if (record.deleted || !isDefined(record.player))
 			return;
 
@@ -219,10 +224,14 @@ potencialAutoKillcamForPlayer(killId)
 			break;
 		}
 
+		// Dont replay this action if it was fully followed (keep it in loop if round ended and we replay it again)
+		if (record.fullyFollowedBySpectator)
+			continue;
+
 		if (isDefined(self.killcam))
 			continue;
 
-		if (level.autoSpectating_intenseSituation)
+		if (level.spectatingSystem_killcam_intenseSituation)
 			continue;
 
 		// Killer does not see more enemy for 3 seconds (action is finished)
@@ -232,20 +241,20 @@ potencialAutoKillcamForPlayer(killId)
 			time_killer_no_enemy = 0;
 
 		// Spectated player does not see enemy for 3 seconds (to avoid switch before some interesting action)
-		if (!isDefined(level.autoSpectating_spectatedPlayer) || !isDefined(level.autoSpectating_spectatedPlayer.autospectator_visibleEnemy))
+		if (!isDefined(level.spectatingSystem_player) || !isDefined(level.spectatingSystem_player.autospectator_visibleEnemy))
 			time_spectated_no_enemy += 0.05;
 		else
 			time_spectated_no_enemy = 0;
 
 
 		// No action for few seconds and no killcam proposal is active
-		if (time_killer_no_enemy >= 3 && time_spectated_no_enemy >= 3 && !self.autoSpectating_killcamProposingVisible)
+		if (time_killer_no_enemy >= 3 && time_spectated_no_enemy >= 3 && !self.spectatingSystem_killcam_proposingVisible)
 		{
 			// Show killcam proposal
 			self thread showKillcamProposingForPlayer(killId);
 
 			// While proposing is visible, watch for round end or active killcam replay (in that case cancel proposing)
-			while(self.autoSpectating_killcamProposingVisible)
+			while(self.spectatingSystem_killcam_proposingVisible)
 			{
 				// If round ended whole we were proposing for killcam, change it to auto-replay
 				if (level.gametype == "sd" && level.roundended)
@@ -267,6 +276,13 @@ potencialAutoKillcamForPlayer(killId)
 					break;
 				}
 
+				// Player changed team
+				if (self.pers["team"] != "streamer")
+				{
+					self thread hideKillcamProposingForPlayer();
+					return;
+				}
+
 				wait level.frame;
 			}
 
@@ -279,13 +295,13 @@ showKillcamProposingForPlayer(killId)
 {
 	self endon("disconnect");
 
-	if (self.autoSpectating_killcamProposingVisible)
+	if (self.spectatingSystem_killcam_proposingVisible)
 		return;
 
-	self.autoSpectating_killcamProposingVisible = true;
+	self.spectatingSystem_killcam_proposingVisible = true;
 
-	record = level.autoSpectating_kills[killId];
-	time = level.autoSpectating_killcamProposingTime;
+	record = level.spectatingSystem_killcam_kills[killId];
+	time = level.spectatingSystem_killcam_proposingTime;
 	disableTime = 1.5;
 	prematureEnd = .5;
 	fadeOutTime = 0.25;
@@ -340,14 +356,14 @@ showKillcamProposingForPlayer(killId)
 	wait level.fps_multiplier * disableTime;
 	time -= disableTime;
 
-	if (!self.autoSpectating_killcamProposingVisible)
+	if (!self.spectatingSystem_killcam_proposingVisible)
 		return;
 
 	self thread killcamProposingKey(killId);
 
 	wait level.fps_multiplier * time;
 
-	if (!self.autoSpectating_killcamProposingVisible)
+	if (!self.spectatingSystem_killcam_proposingVisible)
 		return;
 
 	self.autoSpectating_KillcamProposingBG fadeOverTime(fadeOutTime);
@@ -362,7 +378,7 @@ showKillcamProposingForPlayer(killId)
 
 	wait level.fps_multiplier * prematureEnd;
 
-	if (!self.autoSpectating_killcamProposingVisible)
+	if (!self.spectatingSystem_killcam_proposingVisible)
 		return;
 
 	self hideKillcamProposingForPlayer();
@@ -374,7 +390,7 @@ killcamProposingKey(killId)
 
 	for(;;)
 	{
-		if (!self.autoSpectating_killcamProposingVisible)
+		if (!self.spectatingSystem_killcam_proposingVisible)
 			break;
 
 		if (self useButtonPressed())
@@ -419,7 +435,7 @@ hideKillcamProposingForPlayer()
 	}
 
 
-	self.autoSpectating_killcamProposingVisible = false;
+	self.spectatingSystem_killcam_proposingVisible = false;
 }
 
 
@@ -462,127 +478,34 @@ watchIntenseSituation()
 			intenseSituationTime = 0;
 
 		// Intense situation is after 3 seconds elapse
-		level.autoSpectating_intenseSituation = (intenseSituationTime > 3);
+		level.spectatingSystem_killcam_intenseSituation = (intenseSituationTime > 3);
 
 
 
-		//if (level.autoSpectating_intenseSituation != lastIntenseSituation)
-		//	println("^3intenseSituation: " + level.autoSpectating_intenseSituation);
+		//if (level.spectatingSystem_killcam_intenseSituation != lastIntenseSituation)
+		//	println("^3intenseSituation: " + level.spectatingSystem_killcam_intenseSituation);
 
-		lastIntenseSituation = level.autoSpectating_intenseSituation;
+		lastIntenseSituation = level.spectatingSystem_killcam_intenseSituation;
 	}
 }
 
 
 
-
-openSpectMenu()
-{
-	//self endon("disconnect");
-
-	/*
-	Open QuickMessage menu trick
-	- this menu is usefull because it does not hide HUD elements as standart menu does
-	- but this menu is openable only via command /mp_qucikmessage in client side
-	- also to open this menu player must be alive player (wich spectator is not)
-	- trick is is move spectator into "none" team and set him as "dead", in wich case the /mp_qucikmessage works
-	- only problem is that this game is quite bugged and there are some side effect:
-		- if players in "allies" or "axis" team are all dead and they are in "spectator" state,
-		  for some reason players with clientId lower then spectator clientId starts following this spectator
-		- because spectator is spawned outside map and then imidietly back to spectating mode, players
-		  with lower clientId stays outside map
-		- we need to save current position of players with clientId lower then spectator clientId and
-		  only if all players are dead in their team
-	*/
-	allies = 0;
-	axis = 0;
-	players = getentarray("player", "classname");
-	for(i = 0; i < players.size; i++)
-	{	// Count alive players in teams
-		if (players[i].sessionteam == "allies" && players[i].sessionstate != "spectator")	allies++;
-		if (players[i].sessionteam == "axis"   && players[i].sessionstate != "spectator")	axis++;
-	}
-	for(i = 0; i < players.size; i++)
-	{	// clientId is lower then spectator and not player are alive in team
-		if (players[i] GetEntityNumber() < self GetEntityNumber() &&
-		   ((allies == 0 && players[i].sessionteam == "allies") || (axis == 0 && players[i].sessionteam == "axis")))
-		{
-			players[i].spectating_killcam_origin = players[i].origin;
-			players[i].spectating_killcam_angles = players[i].angles;
-		}
-	}
-
-	spectatorclient = self.spectatorclient;
-	origin = self getOrigin();
-	angles = self getPlayerAngles();
-
-	self.sessionteam = "none";
-	self.sessionstate = "dead"; // enable quickmessage
-	self.spectatorclient = -1;
-	self spawn((-99999, -99999, -99999), (0,0,0));
-
-	self setClientCvar2("ui_quickmessage_spectatormode", "1");
-
-	spectMenuSetRows();
-
-	// Exec command on client side
-	// If some menu is already opened:
-	//	- by player (by ESC command) -> it will work well over already opened menu
-	//  - by script (via openMenu()) -> that menu will be closed and exec_cmd will not be closed correctly
-	//			(mouse will be visible with clear backgorund.... so closeMenu() is called to close that menu)
-	self setClientCvar2("exec_cmd", "mp_quickmessage");
-	self openMenu(game["menu_exec_cmd"]);		// open menu via script
-	self closeMenu();							// will only close menu opened by script
-
-	wait level.frame * 2;
-
-	// Spectator may disconnect
-	if (isDefined(self))
-	{
-		self.sessionteam = "spectator";
-		self.sessionstate = "spectator";
-		if (self.spectatorclient == -1)
-			self.spectatorclient = spectatorclient;
-
-		wait level.frame;
-	}
-
-	// Spawn to previous location
-	players = getentarray("player", "classname");
-	for(i = 0; i < players.size; i++)
-	{
-		if (isDefined(players[i].spectating_killcam_origin))
-		{
-			players[i] spawn(players[i].spectating_killcam_origin, players[i].spectating_killcam_angles);
-			players[i].spectating_killcam_origin = undefined;
-			players[i].spectating_killcam_angles = undefined;
-			//players[i] iprintln("^1 APPLIED SPECTATE BUG FIX");
-		}
-	}
-
-	// Spawn to previous location
-	if (isDefined(self))	// Spectator may disconnect
-		self spawn(origin, angles);
-}
-
-
-
-
-spectMenuSetRows()
+HUD_SetRowsInMenu()
 {
-	self.autoSpectating_killIndexes = [];
+	self.spectatingSystem_killcam_indexes = [];
 
 	str = "";
 	row = 0;
-	for (i = level.autoSpectating_kills.size-1; i >= 0; i--)
+	for (i = level.spectatingSystem_killcam_kills.size-1; i >= 0; i--)
 	{
-		record = level.autoSpectating_kills[i];
+		record = level.spectatingSystem_killcam_kills[i];
 
 		if (record.deleted) continue;
 		if (!isDefined(record.player)) continue;
 		if ((gettime() - record.time) > 37000) continue; // 40 seconds is a maximum that killcam can replay
 
-		self.autoSpectating_killIndexes[row] = i;
+		self.spectatingSystem_killcam_indexes[row] = i;
 
 		str += (row+1) + ".   " + getTimeString(record.time, record.bombPlanted) + "  " + record.player.name + "^7   ("+record.kills+" kill)\n";
 		row++;
@@ -615,7 +538,7 @@ replayActionForAll(killId)
 	for(i = 0; i < players.size; i++)
 	{
 		player = players[i];
-		if (player.pers["team"] == "spectator" && player.pers["autoSpectating"])
+		if (player.pers["team"] == "streamer" && player.spectatingSystem_turnedOn)
 		{
 			player thread replayAction(killId, false);
 		}
@@ -631,7 +554,7 @@ replayAction(killId, print)
 	while(isDefined(self.killcam))
 		wait level.frame;
 
-	record = level.autoSpectating_kills[killId];
+	record = level.spectatingSystem_killcam_kills[killId];
 
 	if (!isDefined(record))
 	{
@@ -652,7 +575,8 @@ replayAction(killId, print)
 		return;
 	}
 
-	self iprintln("Playing killcam for: " + record.player.name);
+	if (level.debug_spectator)
+		self iprintln("Playing killcam for: " + record.player.name);
 
 	timeBeforeKill = 2.5;
 	timeAfterKill = 1.5;
diff --git a/source/maps/mp/gametypes/_spectating_system_xray.gsc b/source/maps/mp/gametypes/_spectating_system_xray.gsc
new file mode 100644
index 0000000..0f014fe
--- /dev/null
+++ b/source/maps/mp/gametypes/_spectating_system_xray.gsc
@@ -0,0 +1,492 @@
+#include maps\mp\gametypes\global\_global;
+
+init()
+{
+	if (!level.spectatingSystem)
+		return;
+
+	if(game["firstInit"])
+	{
+		precacheShader("stance_stand_front");
+		precacheShader("stance_stand_back");
+		precacheShader("stance_stand_left");
+		precacheShader("stance_stand_right");
+		precacheShader("stance_crouch_front");
+		precacheShader("stance_crouch_back");
+		precacheShader("stance_crouch_left");
+		precacheShader("stance_crouch_right");
+		precacheShader("stance_prone_front");
+		precacheShader("stance_prone_back");
+		precacheShader("stance_prone_left");
+		precacheShader("stance_prone_right");
+
+		game["STRING_SPECTATINGSYSTEM_XRAY_ON"] = 		"XRAY ^2On";
+		game["STRING_SPECTATINGSYSTEM_XRAY_OFF"] = 		"XRAY ^1Off";
+
+		precacheString2("STRING_SPECTATINGSYSTEM_ARROW_LEFT", &"<");
+		precacheString2("STRING_SPECTATINGSYSTEM_ARROW_RIGHT", &">");
+	}
+
+	addEventListener("onConnected",  ::onConnected);
+}
+
+onConnected()
+{
+	if (!isDefined(self.pers["spectatingSystem_XRAY"]))
+		self.pers["spectatingSystem_XRAY"] = false;
+
+	self.spectatingSystem_XRAY_inFreeSpectating = false;
+}
+
+
+toggle()
+{
+	if (self.spectatingSystem_freeSpectating)
+	{
+		self.spectatingSystem_XRAY_inFreeSpectating = !self.spectatingSystem_XRAY_inFreeSpectating;
+		self.pers["spectatingSystem_XRAY"] = self.spectatingSystem_XRAY_inFreeSpectating;
+	}
+	else
+		self.pers["spectatingSystem_XRAY"] = !self.pers["spectatingSystem_XRAY"];
+
+	if (self.pers["spectatingSystem_XRAY"])
+		self iprintln(game["STRING_SPECTATINGSYSTEM_XRAY_ON"]);
+	else
+		self iprintln(game["STRING_SPECTATINGSYSTEM_XRAY_OFF"]);
+}
+
+
+
+XRAY_Destroy()
+{
+	// Destroy all
+	for(i = 0; i < self.spectatingSystem_XRAY_names.size; i++)
+	{
+		// If HUD is not defined, it means player disconnect and HUD object was deleted
+		if (isDefined(self.spectatingSystem_XRAY_names[i]))
+			self.spectatingSystem_XRAY_names[i] destroy2();
+		if (isDefined(self.spectatingSystem_XRAY_images[i]))
+			self.spectatingSystem_XRAY_images[i] destroy2();
+	}
+	self.spectatingSystem_XRAY_names = undefined;
+	self.spectatingSystem_XRAY_images = undefined;
+
+	if (level.debug_spectator) self iprintln("autospec> XRAY HUD destroyed ^1ALL");
+}
+
+/*
+self is spectater
+*/
+XRAY_Loop()
+{
+	self endon("disconnect");
+
+	if (isDefined(self.spectatingSystem_XRAY_names))
+		self XRAY_Destroy();
+	self.spectatingSystem_XRAY_names = [];
+	self.spectatingSystem_XRAY_images = [];
+
+	self thread FollowCloseByPlayer();
+
+	i_XRAY = 0;
+	freeSpectating = self.spectatingSystem_freeSpectating;
+
+	for(;;)
+	{
+		// Clear unused HUD elements
+		for (i = self.spectatingSystem_XRAY_names.size - 1; i >= i_XRAY; i--)
+		{
+			// If HUD is not defined, it means player disconnect and HUD object was deleted
+			if (isDefined(self.spectatingSystem_XRAY_names[i]))
+				self.spectatingSystem_XRAY_names[i] destroy2();
+			if (isDefined(self.spectatingSystem_XRAY_images[i]))
+				self.spectatingSystem_XRAY_images[i] destroy2();
+
+			self.spectatingSystem_XRAY_names[i] = undefined;
+			self.spectatingSystem_XRAY_images[i] = undefined;
+
+			if (level.debug_spectator) self iprintln("autospec> XRAY HUD destroyed index " + i);
+		}
+
+		wait level.frame;
+
+		i_XRAY = 0;
+
+		// Player disconnects
+		if (!isDefined(self))
+			break;
+		// Variables destroyed (not likely)
+		if (!isDefined(self.spectatingSystem_XRAY_names) || !isDefined(self.spectatingSystem_XRAY_images))
+			break;
+		// All needs to be removed (changed team)
+		if (self.pers["team"] != "streamer")
+			break;
+		// Hide hud in Readyup or bash
+		if (/*level.in_readyup || */level.in_bash)
+			continue;
+		// Dont show XRAY if killcam or its turned off
+		if (isDefined(self.killcam))
+			continue;
+
+
+		// If player started free spectating, force XRAY by another toggler
+		if (freeSpectating != self.spectatingSystem_freeSpectating && self.spectatingSystem_freeSpectating)
+			self.spectatingSystem_XRAY_inFreeSpectating = true;
+		freeSpectating = self.spectatingSystem_freeSpectating;
+
+		// Get spectated player
+		spectated_player = undefined;
+		if (self.spectatingSystem_turnedOn && isDefined(level.spectatingSystem_player))
+			spectated_player = level.spectatingSystem_player;
+
+
+		// In free spectating is XRAY enabled by default (to enable follow close by player)
+		// There is separated toggler for that
+		if (self.spectatingSystem_freeSpectating)
+		{
+			// XRAY is turned off
+			if (!self.spectatingSystem_XRAY_inFreeSpectating)
+				continue;
+		}
+		else
+		{
+			// XRAY is turned off
+			if (!self.pers["spectatingSystem_XRAY"])
+				continue;
+
+			// Show xray only if we know spectated player
+			if (!isDefined(spectated_player))
+				continue;
+		}
+
+
+		// Find players that will be showed via XRAY
+		players = getentarray("player", "classname");
+		for(i = 0; i < players.size; i++)
+		{
+			player = players[i];
+			if (player == self || !(player.pers["team"] == "allies" || player.pers["team"] == "axis"))
+				continue;
+			if (player.sessionstate != "playing" && player.sessionstate != "dead")
+				continue;
+
+			// Skip spectated player
+			if (isDefined(spectated_player) && player == spectated_player)
+				continue;
+
+			// When auto-spectating (not flying) and followed player died, hide all (because game does not provide correct angles in this session state)
+			if (isDefined(spectated_player) && spectated_player.sessionstate != "playing")
+				continue;
+
+			// When auto-spectating show only enemy (except for DM where show all players)
+			// When free-flying show all players
+			if (isDefined(spectated_player) && spectated_player.sessionteam == player.sessionteam && player.sessionteam != "none")
+				continue;
+
+
+			// Create new HUD element
+			isNew = false;
+			if (!isDefined(self.spectatingSystem_XRAY_names[i_XRAY]))
+			{
+				self.spectatingSystem_XRAY_names[i_XRAY] = addHUDClient(self, 10, 10, 1.2, (1,1,1), "center", "bottom", "subleft", "subtop");
+				self.spectatingSystem_XRAY_names[i_XRAY].name = "name";
+				self.spectatingSystem_XRAY_names[i_XRAY].archived = false;
+
+				self.spectatingSystem_XRAY_images[i_XRAY] = addHUDClient(self, 10, 10, 1.2, (1,1,1), "center", "bottom", "subleft", "subtop");
+				self.spectatingSystem_XRAY_images[i_XRAY].name = "layout";
+				self.spectatingSystem_XRAY_images[i_XRAY].archived = false;
+				self.spectatingSystem_XRAY_images[i_XRAY].sort = -1;
+
+				isNew = true;
+
+				if (level.debug_spectator) self iprintln("autospec> XRAY HUD added NEW index " + i_XRAY);
+			}
+
+			// Update HUD
+			if (isNew || self.spectatingSystem_XRAY_names[i_XRAY].player != player)
+			{
+				self.spectatingSystem_XRAY_names[i_XRAY].player = player;
+				self.spectatingSystem_XRAY_names[i_XRAY].offset = (0, 0, 25);
+				self.spectatingSystem_XRAY_names[i_XRAY].tag = "head";
+				self.spectatingSystem_XRAY_names[i_XRAY].string = "name"; // name | < | >
+				self.spectatingSystem_XRAY_names[i_XRAY].fontscale = 0.8;
+				self.spectatingSystem_XRAY_names[i_XRAY] SetPlayerNameString(player);
+				self.spectatingSystem_XRAY_names[i_XRAY] thread SetPlayerWaypoint(self, player);
+				self.spectatingSystem_XRAY_names[i_XRAY] thread hud_waypoint_animate(self, player);
+
+				self.spectatingSystem_XRAY_images[i_XRAY].player = player;
+				self.spectatingSystem_XRAY_images[i_XRAY].offset = (0, 0, -15);
+				self.spectatingSystem_XRAY_images[i_XRAY] thread SetPlayerWaypoint(self, player);
+				self.spectatingSystem_XRAY_images[i_XRAY] thread hud_waypoint_animate(self, player);
+			}
+
+			i_XRAY++;
+		}
+	}
+
+	// Destroy HUD (unles player disconnects)
+	if (isDefined(self))
+		self XRAY_Destroy();
+}
+
+
+/*
+When free-flying check for close-by player according to XRAY names
+*/
+FollowCloseByPlayer()
+{
+	self endon("disconnect");
+
+	self.spectatingSystem_HUD_followPlayerName = addHUDClient(self, 0, 50, 1.2, (1,1,1), "center", "top", "center", "top");
+	self.spectatingSystem_HUD_followPlayerName.alpha = 0;
+
+	saved_player_last = undefined;
+
+	for(;;)
+	{
+		wait level.frame;
+
+		// All needs to be removed (changed team or timeout is called)
+		if (!isDefined(self) || self.pers["team"] != "streamer" /*|| level.in_readyup*/)
+			break;
+
+		if (!self.spectatingSystem_freeSpectating)
+			continue;
+
+		saved_dist2D = 0;
+		saved_dist3D = 0;
+		saved_player = undefined;
+
+		for(i = 0; i < self.spectatingSystem_XRAY_names.size; i++)
+		{
+			hud = self.spectatingSystem_XRAY_names[i];
+
+			// If HUD is not defined, it means player disconnect and HUD object was deleted
+			if (!isDefined(hud) || !isDefined(hud.player) || !isAlive(hud.player))
+				continue;
+
+			// Find out looking at player to follow on click
+			dist3D = distance(self.origin, hud.player.origin);
+
+			// If text is somewhere in rectangle around center
+			if ((hud.x > 160 && hud.x < 480 && hud.y > 120 && hud.y < 360) || (dist3D < 300 && hud.x > 160 && hud.x < 480))
+			{
+				if (dist3D < 1000)
+				{
+					dist2D = distance((hud.x, hud.y, 0), (320, 240, 0));	// Distance of text from center - text is in 640x480 rectangle aligned left top
+
+					if (!isDefined(saved_player) || (dist2D < saved_dist2D && dist3D < saved_dist3D))
+					{
+						saved_dist2D = dist2D;
+						saved_dist3D = dist3D;
+						saved_player = hud.player;
+					}
+				}
+			}
+		}
+
+		time = 0.1;
+
+		if (isDefined(saved_player))
+		{
+			if (isDefined(saved_player_last) && saved_player_last != saved_player)
+			{
+				self.spectatingSystem_HUD_followPlayerName fadeOverTime(time);
+				self.spectatingSystem_HUD_followPlayerName.alpha = 0;
+				wait level.fps_multiplier * time;
+				if (!isDefined(self)) break; // in case player disconnects
+			}
+			if (!isDefined(saved_player_last) || saved_player_last != saved_player)
+			{
+				self.spectatingSystem_HUD_followPlayerName SetPlayerNameString(saved_player);
+				self.spectatingSystem_HUD_followPlayerName fadeOverTime(time);
+				self.spectatingSystem_HUD_followPlayerName.alpha = 1;
+				wait level.fps_multiplier * time;
+				if (!isDefined(self)) break; // in case player disconnects
+			}
+		}
+		else if (isDefined(saved_player_last))
+		{
+			self.spectatingSystem_HUD_followPlayerName fadeOverTime(time);
+			self.spectatingSystem_HUD_followPlayerName.alpha = 0;
+			wait level.fps_multiplier * time;
+			if (!isDefined(self)) break; // in case player disconnects
+		}
+
+		saved_player_last = saved_player;
+
+		self.spectatingSystem_playerToFollow = saved_player;
+	}
+
+	self.spectatingSystem_HUD_followPlayerName destroy2();
+}
+
+
+
+
+// self is HUD, spectator is hud owner and player is waypoined player
+hud_waypoint_animate(spectator, player)
+{
+	// Make sure only 1 thread is running on this HUD element
+	self notify("hud_waypoint_animate");
+	self endon("hud_waypoint_animate");
+
+	alpha_old = 0;
+	alpha_cnt = 0;
+	alpha_last = 0;
+	self.alpha = 0;
+
+	for (;;)
+	{
+		wait level.frame;
+		waittillframeend;
+
+		if (!isDefined(self) || !isDefined(spectator) || !isDefined(player))
+			break;
+
+		// Get spectated player
+		spectated_player = spectator;
+		if (!isDefined(spectator.killcam) && spectator.spectatingSystem_turnedOn && isDefined(level.spectatingSystem_player))
+			spectated_player = level.spectatingSystem_player;
+
+
+		alpha = 0.0;
+		if (isAlive(player))
+		{
+			// Player is far way
+			dist = distance(spectated_player.origin, player.origin);
+
+			if (self.name == "name")
+			{
+				// TODO show names on screen
+				if (self.x < 40)
+				{
+					self.x = 40;
+					self.y = 310;
+
+					if (self.string != "<")
+					{
+						self.string = "<";
+						self SetText(game["STRING_SPECTATINGSYSTEM_ARROW_LEFT"]);
+						self.fontscale = 1.2;
+					}
+				}
+				else if (self.x > 640 - 40)
+				{
+					self.x = 640 - 40;
+					self.y = 310;
+
+					if (self.string != ">")
+					{
+						self.string = ">";
+						self SetText(game["STRING_SPECTATINGSYSTEM_ARROW_RIGHT"]);
+						self.fontscale = 1.2;
+					}
+				}
+				else
+				{
+					if (self.string != "name")
+					{
+						self.string = "name";
+						self SetPlayerNameString(player);
+						self.fontscale = 0.8;
+					}
+				}
+
+				// Show name only if enemy is close, in free spectating or if arrows are showed
+				if (dist < 1500 || spectator.spectatingSystem_freeSpectating || self.string == "<" || self.string == ">")
+					alpha = 1;
+			}
+
+			if (self.name == "layout")
+			{
+				// Hide player icon when player is visible
+				if (!spectated_player isPlayerInSight(player) && !spectator.spectatingSystem_freeSpectating)
+					alpha = 0.5;
+			}
+
+			// Hide if mouse is over
+			if (!spectator.spectatingSystem_freeSpectating)
+			{/*
+				// If is in center, add alpha
+				dist2D = distance((self.x, self.y, 0), (320, 240, 0));	// Distance of text from center - text is in 640x480 rectangle aligned left top
+				if (dist2D <= 25)
+					alpha = 0.0;
+				else if (dist2D > 25 && dist2D <= 150)
+					alpha = alpha * ((dist2D-25) / 125);*/
+			}
+		}
+
+		// Alpha smooth animation
+		if (alpha_last != alpha)
+		{
+			alpha_old = self.alpha;
+			alpha_cnt = 10;
+			alpha_last = alpha;
+		}
+		if (alpha_cnt > 0)
+		{
+			self.alpha = alpha_old + ((alpha - alpha_old) / 10) * (10-alpha_cnt);
+			alpha_cnt--;
+		}
+		else
+			self.alpha = alpha;
+
+
+		// Item is not visible, no need to continue animation
+		if (self.alpha == 0)
+			continue;
+
+
+		if (self.name == "name")
+		{
+			color = (0.8, 0.8, 0.8);
+
+			self.color = color;
+		}
+
+
+		if (self.name == "layout")
+		{
+			stance = player maps\mp\gametypes\global\player::getStance(); // prone crouch stand
+
+			angles = player getPlayerAngles();
+
+			diff = (player.origin - spectated_player.origin);
+			diff = (diff[0], diff[1], 0);
+			diff = vectortoangles(diff);
+
+			angle = (angles[1] - diff[1]);
+
+			if (angle > 180)	angle -= 360;
+			else if (angle < -180)	angle += 360;
+			angle += 180; // flip direction, now in range 0 <-> 360
+			if (angle > 180) angle -= 360; // back to range -180 <-> +180
+
+
+			if ((angle > 135 && angle <= 180) || (angle < -135 && angle >= -180))
+				self.shader = "stance_" + stance + "_back";
+			else if (angle > 45 && angle < 135)
+				self.shader = "stance_" + stance + "_right";
+			else if (angle < -45 && angle > -135)
+				self.shader = "stance_" + stance + "_left";
+			else
+				self.shader = "stance_" + stance + "_front";
+
+			self.w = 25;
+			self.h = 25;
+			self.scale = 1400;
+
+			color = (0.9, 0.9, 0.9);
+
+			if (player.health <= 0)
+				color = (1, 0, 0); // red
+			else if (player.health < 100)
+			{
+				dmg = (player.health / 100);
+				color = (color[0] + (1-color[0]) * (1-dmg), color[1] * dmg, color[2] * dmg);
+			}
+			self.color = color;
+		}
+	}
+}
diff --git a/source/maps/mp/gametypes/_teamname.gsc b/source/maps/mp/gametypes/_teamname.gsc
index 8c6ba08..46e3c22 100644
--- a/source/maps/mp/gametypes/_teamname.gsc
+++ b/source/maps/mp/gametypes/_teamname.gsc
@@ -11,6 +11,89 @@ Init()
 	level.teamname["axis"] = "";
 
 	// Team names are updated only if its needed for other functions (matchinfo, recording, ...)
+/*
+	// Testing
+	names[0] = "UGNC | eyza";
+	names[1] = "UGNC | aske";
+	names[2] = "UGNC | tomik";
+	names[3] = "UGNC | nostry";
+	names[4] = "UGNC | lampy";
+	println(getBestNameFromArray(names));
+
+	names[0] = "ONLINEGAMERS | dymatize";
+	names[1] = "ONLINEGAMERS | DudlajS";
+	names[2] = "ONLINEGAMERS | C A A -";
+	names[3] = "ONLINEGAMERS | VITY";
+	names[4] = "ONLINEGAMERS | hurvajz";
+	println(getBestNameFromArray(names));
+
+	names[0] = "CITRO()NS ajxera";
+	names[1] = "CITRO()NS network";
+	names[2] = "CITRO()NS Za$$kodn1K__";
+	names[3] = "CITRO()NS dur1el -";
+	names[4] = "CITRO()NS CHACHARUS";
+	println(getBestNameFromArray(names));
+
+	names[0] = "Reanimation Sp1RiT";
+	names[1] = "Reanimation pawadox-";
+	names[2] = "Reanimation G4box(..!..)";
+	names[3] = "Reanimation blavex";
+	names[4] = "Reanimation Sk1lzZ<3";
+	println(getBestNameFromArray(names));
+
+	names[0] = "BoMbSQUad vioqor";
+	names[1] = "BoMbSQUad mavalam";
+	names[2] = "BoMbSQUad domz";
+	names[3] = "BoMbSQUad iconz";
+	names[4] = "BoMbSQUad SANTAN";
+	println(getBestNameFromArray(names));
+
+	names[0] = "[ < T N F > ] Blinde";
+	names[1] = "[ < T N F > ] deb1lek";
+	names[2] = "[ < T N F > ] CHARVIS";
+	names[3] = "[ < T N F > ] Fazi";
+	names[4] = "[ < T N F > ] inhox";
+	println(getBestNameFromArray(names));
+
+	names[0] = "(.Y.) seko";
+	names[1] = "(.Y.) l e r i X";
+	names[2] = "(.Y.) C E R K Y S";
+	names[3] = "(.Y.) A N T O N I N";
+	names[4] = "(.Y.)Mekgajver";
+	println(getBestNameFromArray(names));
+
+	names = [];
+
+	names[0] = "";
+	println(getBestNameFromArray(names));
+
+	names[0] = "Single player";
+	println(getBestNameFromArray(names));
+
+	names[0] = "a|";
+	names[1] = "b|";
+	println(getBestNameFromArray(names));
+
+	names[0] = "aa|";
+	names[1] = "bb|";
+	println(getBestNameFromArray(names));
+
+	names[0] = ".";
+	names[1] = "-";
+	println(getBestNameFromArray(names));
+
+	names[0] = "aa";
+	names[1] = "bb";
+	println(getBestNameFromArray(names));
+
+	names[0] = "";
+	names[1] = "";
+	println(getBestNameFromArray(names));
+
+	names[0] = " ";
+	names[1] = " ";
+	println(getBestNameFromArray(names));
+*/
 }
 
 
@@ -36,8 +119,6 @@ refreshTeamName(team)
 
 getTeamName(team)
 {
-	perc = 0.82;
-
 	names = [];
 
 	players = getentarray("player", "classname");
@@ -53,8 +134,11 @@ getTeamName(team)
 		}
 	}
 
+	return getBestNameFromArray(names);
+}
 
-
+getBestNameFromArray(names)
+{
     if (names.size == 0)
     {
         return ""; // EMPTYTEAM
@@ -64,6 +148,7 @@ getTeamName(team)
         return names[0];
     }
 
+	perc = 0.9;
 
 	// Save length of the longest name
 	maxLength = 0;
@@ -235,6 +320,7 @@ getTeamName(team)
 
 	// Remove unallowed chars
 	final_word = getSecureString(final_word);
+	final_word = removeEndSymbols(final_word);
 
     return final_word;
 }
@@ -261,6 +347,45 @@ getSecureString(string)
 	return string_secure;
 }
 
+removeEndSymbols(string)
+{
+	// Remove chars that cannot be used in team name
+	alfanumericChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+	if (string.size <= 2) return string;
+
+	charLast = string[string.size - 1];
+	charLast2 = string[string.size - 2];
+
+	charLast_alfanumeric = false;
+	for (i = 0; i < alfanumericChars.size; i++)
+	{
+		if (alfanumericChars[i] == charLast)
+		{
+			charLast_alfanumeric = true;
+			break;
+		}
+	}
+
+	charLast2_alfanumeric = false;
+	for (i = 0; i < alfanumericChars.size; i++)
+	{
+		if (alfanumericChars[i] == charLast2)
+		{
+			charLast2_alfanumeric = true;
+			break;
+		}
+	}
+
+	// Remove last non-alfanumeric char
+	if (charLast_alfanumeric == false && charLast2_alfanumeric)
+	{
+		return getsubstr(string, 0, string.size - 1);
+	}
+
+	return string;
+}
+
 removeSameItems(array)
 {
     array_to_return = [];
diff --git a/source/maps/mp/gametypes/_teams.gsc b/source/maps/mp/gametypes/_teams.gsc
index d917993..616fcef 100644
--- a/source/maps/mp/gametypes/_teams.gsc
+++ b/source/maps/mp/gametypes/_teams.gsc
@@ -12,6 +12,7 @@ init()
     	addEventListener("onDisconnect",    	::onDisconnect);
     	addEventListener("onJoinedAlliesAxis",  ::onJoinedAlliesAxis);
         addEventListener("onJoinedSpectator",   ::onJoinedSpectator);
+	addEventListener("onJoinedStreamer",  ::onJoinedStreamer);
 }
 
 
@@ -70,6 +71,12 @@ onStartGameType()
 
 onConnected()
 {
+	self endon("disconnect");
+
+	// Wait till response about downloaded mod from player is received - we know player is not in lag
+	while (!self.pers["modDownloaded"])
+		wait level.frame;
+
 	self updateAutoAssignCvar();
 	level thread updateTeamChangeCvars();
 }
@@ -96,6 +103,14 @@ onJoinedSpectator()
 	level thread updateTeamChangeCvars();
 }
 
+onJoinedStreamer()
+{
+	self.pers["teamTime"] = undefined;
+
+	self updateAutoAssignCvar();
+	level thread updateTeamChangeCvars();
+}
+
 
 
 watchBalance()
@@ -319,38 +334,36 @@ updateTeamChangeCvars()
 	{
 		player = players[i];
 
-		if(player.pers["team"] != "spectator" && player.pers["team"] != "none")
+
+		if(player.pers["team"] == "allies")
 		{
-			if(player.pers["team"] == "allies")
+			if(!isdefined(player.allow_joinallies) || player.allow_joinallies != 2)
 			{
-				if(!isdefined(player.allow_joinallies) || player.allow_joinallies != 2)
-				{
-					player.allow_joinallies = 2;
-					player setClientCvar2("ui_allow_joinallies", player.allow_joinallies);
-				}
+				player.allow_joinallies = 2;
+				player setClientCvar2("ui_allow_joinallies", player.allow_joinallies);
+			}
 
-				if(!isdefined(player.allow_joinaxis) || player.allow_joinaxis != joinaxis)
-				{
-					player.allow_joinaxis = joinaxis;
-					player setClientCvar2("ui_allow_joinaxis", player.allow_joinaxis);
-				}
+			if(!isdefined(player.allow_joinaxis) || player.allow_joinaxis != joinaxis)
+			{
+				player.allow_joinaxis = joinaxis;
+				player setClientCvar2("ui_allow_joinaxis", player.allow_joinaxis);
 			}
-			else if(player.pers["team"] == "axis")
+		}
+		else if(player.pers["team"] == "axis")
+		{
+			if(!isdefined(player.allow_joinallies) || player.allow_joinallies != joinallies)
 			{
-				if(!isdefined(player.allow_joinallies) || player.allow_joinallies != joinallies)
-				{
-					player.allow_joinallies = joinallies;
-					player setClientCvar2("ui_allow_joinallies", player.allow_joinallies);
-				}
+				player.allow_joinallies = joinallies;
+				player setClientCvar2("ui_allow_joinallies", player.allow_joinallies);
+			}
 
-				if(!isdefined(player.allow_joinaxis) || player.allow_joinaxis != 2)
-				{
-					player.allow_joinaxis = 2;
-					player setClientCvar2("ui_allow_joinaxis", player.allow_joinaxis);
-				}
+			if(!isdefined(player.allow_joinaxis) || player.allow_joinaxis != 2)
+			{
+				player.allow_joinaxis = 2;
+				player setClientCvar2("ui_allow_joinaxis", player.allow_joinaxis);
 			}
 		}
-		else
+		else // spectator, streamer, none
 		{
 			if(!isdefined(player.allow_joinallies) || player.allow_joinallies != joinallies)
 			{
@@ -364,6 +377,9 @@ updateTeamChangeCvars()
 				player setClientCvar2("ui_allow_joinaxis", player.allow_joinaxis);
 			}
 		}
+
+
+		player setClientCvar2("ui_allow_joinstreamer", level.spectatingSystem);
 	}
 }
 
diff --git a/source/maps/mp/gametypes/_timeout.gsc b/source/maps/mp/gametypes/_timeout.gsc
index 5f87e24..b33169c 100644
--- a/source/maps/mp/gametypes/_timeout.gsc
+++ b/source/maps/mp/gametypes/_timeout.gsc
@@ -64,8 +64,9 @@ onCvarChanged(cvar, value, isRegisterTime)
 
 onConnected()
 {
-    // Set actual timeout status on player connect + when round restart in SD
-    self Update_Player_HUD_Cvar();
+	// Set actual timeout status on player connect + when round restart in SD
+	if (isDefined(self.pers["firstTeamSelected"])) // save cvars sent to player on first connect
+		self Update_Player_HUD_Cvar();
 }
 
 onJoinedTeam(teamName)
@@ -77,7 +78,8 @@ onJoinedTeam(teamName)
 onSpawned()
 {
     // Set actual timeout status on player connect + when round restart in SD
-    self Update_Player_HUD_Cvar();
+    if (isDefined(self.pers["firstTeamSelected"])) // save cvars sent to player on first connect
+    	self Update_Player_HUD_Cvar();
 
     // Disable weapons
     if (level.in_timeout)
@@ -356,6 +358,12 @@ Start_Timeout_Mode(runned_in_middle_of_game)
 		}
 	}
 
+	waittillframeend; // wait untill spectating_system is initialized
+
+	// History score for spectators
+	level maps\mp\gametypes\_spectating_system_hud::ScoreProgress_AddTimeout();
+
+
 	time_start = gettime();
 
 	// Run readyup mode and wait here untill is finished
diff --git a/source/maps/mp/gametypes/_warnings.gsc b/source/maps/mp/gametypes/_warnings.gsc
index 2e3c326..cf574b4 100644
--- a/source/maps/mp/gametypes/_warnings.gsc
+++ b/source/maps/mp/gametypes/_warnings.gsc
@@ -86,7 +86,7 @@ update()
 	{
 		ver = "_v2";
 		if (map == "mp_burgundy") ver = "_v1";
-	
+
 		errors += "^3This is an old map, use " + map + "_fix" + ver + "^7\n";
 	}
 
diff --git a/source/maps/mp/gametypes/_weapon_drop.gsc b/source/maps/mp/gametypes/_weapon_drop.gsc
index 1b3eaf8..06f2819 100644
--- a/source/maps/mp/gametypes/_weapon_drop.gsc
+++ b/source/maps/mp/gametypes/_weapon_drop.gsc
@@ -122,7 +122,17 @@ playersWeaponDrop()
 				// Used in strattime to check if some weapon was dropped
 				self.dropped_weapons++;
 
-				wait level.fps_multiplier * 1;
+
+				wait level.fps_multiplier * .25;
+
+				// Play sound in strattime indicating where the weapon is dropped
+				if (isDefined(level.in_strattime) && level.in_strattime)
+				{
+					// TODO delayed
+					//self playSound("zpam_weap_drop");
+				}
+
+				wait level.fps_multiplier * .75;
 
 				break;
 			}
@@ -143,6 +153,8 @@ Weapon_PickUp_Monitor()
 	{
 		level waittill("weapon_dropped", weaponname, player);
 
+		//iprintln("Weapon dropped -> " + weaponname + " by " + player.name);
+
 		// Run thread on all dropped weapons, grenades, smokes
 		entities = getentarray("weapon_"+weaponname, "classname");
 		for(i = 0; i < entities.size; i++)
@@ -161,7 +173,7 @@ pickup_think(weaponname) {
 
 	self.hasBrain = true;
 
-//	iprintln("## Running thread on spawend weapon " + weaponname);
+	//iprintln("## Running thread on spawend weapon " + weaponname);
 
 	//iprintln(self.count);
 	//iprintln(self.spawnflags);
diff --git a/source/maps/mp/gametypes/_weapon_limiter.gsc b/source/maps/mp/gametypes/_weapon_limiter.gsc
index 84f1d63..fa7b39d 100644
--- a/source/maps/mp/gametypes/_weapon_limiter.gsc
+++ b/source/maps/mp/gametypes/_weapon_limiter.gsc
@@ -26,7 +26,7 @@ onDisconnect()
 
 onJoinedTeam(teamName)
 {
-	if (teamName == "spectator")
+	if (teamName == "spectator" || teamName == "streamer")
 	{
 		// Update weapons for leaved team
 		if (self.leaving_team == "allies" || self.leaving_team == "axis")
@@ -35,7 +35,7 @@ onJoinedTeam(teamName)
 	else
 	{
 		// Update weapons just for me and my team
-		if (self.leaving_team == "spectator" || self.leaving_team == "none")
+		if (self.leaving_team == "spectator" || self.leaving_team == "streamer" || self.leaving_team == "none")
 			level thread Update_All_Weapon_Limits(); //(teamName); // update my new team
 
 		// Update weapons for all
diff --git a/source/maps/mp/gametypes/_weapons.gsc b/source/maps/mp/gametypes/_weapons.gsc
index c8afcce..273c54f 100644
--- a/source/maps/mp/gametypes/_weapons.gsc
+++ b/source/maps/mp/gametypes/_weapons.gsc
@@ -7,6 +7,8 @@ init()
 	registerCvars();
 
 	addEventListener("onStartGameType", ::onStartGameType);
+
+	level.scr_smoke_fix = true; // TODO smoke
 }
 
 // Called from start_gametype when registring cvars
@@ -288,14 +290,25 @@ precacheWeaponsRifle()
 
 	// Weapons for all
 	precacheItem("binoculars_mp");
+
 }
 
 precacheWeapons()
 {
+	// There is a weird bug with smoke
+	// If precacheItem() with smoke is called as first before any other weapons, the smoke renders in old way with siluets
+	// If precacheItem() with smoke is called after weapons, the smoke renders in new way with thick textures
+
 	switch(game["allies"])
 	{
 	case "american":
 
+		if (level.scr_smoke_fix == false) // old way
+		{
+			precacheItem("frag_grenade_american_mp");
+			precacheItem("smoke_grenade_american_mp");
+		}
+
 		precacheItem("greasegun_mp");
 		precacheItem("m1carbine_mp");
 		precacheItem("m1garand_mp");
@@ -304,8 +317,11 @@ precacheWeapons()
 		precacheItem("thompson_mp");
 		precacheItem("bar_mp");
 
-		precacheItem("frag_grenade_american_mp");
-		precacheItem("smoke_grenade_american_mp");
+		if (level.scr_smoke_fix) // new way
+		{
+			precacheItem("frag_grenade_american_mp");
+			precacheItem("smoke_grenade_american_mp");
+		}
 
 		precacheItem("colt_mp");
 
@@ -313,6 +329,12 @@ precacheWeapons()
 
 	case "british":
 
+		if (level.scr_smoke_fix == false) // old way
+		{
+			precacheItem("frag_grenade_british_mp");
+			precacheItem("smoke_grenade_british_mp");
+		}
+
 		precacheItem("sten_mp");
 		precacheItem("enfield_mp");
 		precacheItem("m1garand_mp");
@@ -321,8 +343,11 @@ precacheWeapons()
 		precacheItem("thompson_mp");
 		precacheItem("bren_mp");
 
-		precacheItem("frag_grenade_british_mp");
-		precacheItem("smoke_grenade_british_mp");
+		if (level.scr_smoke_fix) // new way
+		{
+			precacheItem("frag_grenade_british_mp");
+			precacheItem("smoke_grenade_british_mp");
+		}
 
 		precacheItem("webley_mp");
 
@@ -330,6 +355,12 @@ precacheWeapons()
 
 	case "russian":
 
+		if (level.scr_smoke_fix == false) // old way
+		{
+			precacheItem("frag_grenade_russian_mp");
+			precacheItem("smoke_grenade_russian_mp");
+		}
+
 		precacheItem("PPS42_mp");
 		precacheItem("mosin_nagant_mp");
 		precacheItem("SVT40_mp");
@@ -337,8 +368,11 @@ precacheWeapons()
 		//precacheItem("shotgun_mp");
 		precacheItem("ppsh_mp");
 
-		precacheItem("frag_grenade_russian_mp");
-		precacheItem("smoke_grenade_russian_mp");
+		if (level.scr_smoke_fix) // new way
+		{
+			precacheItem("frag_grenade_russian_mp");
+			precacheItem("smoke_grenade_russian_mp");
+		}
 
 		precacheItem("TT30_mp");
 
@@ -346,6 +380,12 @@ precacheWeapons()
 	}
 
 	// German weapons
+	if (level.scr_smoke_fix == false) // old way
+	{
+		precacheItem("frag_grenade_german_mp");
+		precacheItem("smoke_grenade_german_mp");
+	}
+
 	precacheItem("mp40_mp");
 	precacheItem("kar98k_mp");
 	precacheItem("g43_mp");
@@ -353,8 +393,11 @@ precacheWeapons()
 	//precacheItem("shotgun_mp");
 	precacheItem("mp44_mp");
 
-	precacheItem("frag_grenade_german_mp");
-	precacheItem("smoke_grenade_german_mp");
+	if (level.scr_smoke_fix) // new way
+	{
+		precacheItem("frag_grenade_german_mp");
+		precacheItem("smoke_grenade_german_mp");
+	}
 
 	precacheItem("luger_mp");
 
@@ -697,7 +740,7 @@ dropWeapon()
 
 	if(clipsize || reservesize) {
 		self dropItem(current);
-
+		waittillframeend; // wait before next "weapon_dropped" can be called
 		level notify("weapon_dropped", current, self);
 	}
 
@@ -708,57 +751,84 @@ dropNade()
 	if (!level.allow_nadedrops)
 		return;
 
-	grenadetype = self GetGrenadeTypeName();
 
-	if(grenadetype != "none")
-	{
-		ammosize = self getammocount(grenadetype);
+	grenades = self getFragGrenadeCount();
 
-		if(ammosize)
+	if(grenades > 0)
+	{
+		/*
+		- Droped grenade bug -
+		If player has cooked grenade and is killed, that grenade will be throwed to ground.
+		And because that grenade is not removed from players slot, extra grenade is dropped to ground for pickup
+
+		To fix this bug, we will look for grenade entities in map close to player
+		To detect it correctly, these rules must apply:
+			- throwed grenade is always spawned with 40 offset from player origin in Z axis
+			- that greande will blow in exacly 3.8 seconds
+
+		Avoid greande drop if these rules applies!
+		*/
+
+		// Loop grenades in map
+		grenades = getentarray("grenade","classname");
+		for(i=0;i<grenades.size;i++)
 		{
-			/*
-			- Droped grenade bug -
-			If player has cooked grenade and is killed, that grenade will be throwed to ground.
-			And because that grenade is not removed from players slot, extra grenade is dropped to ground for pickup
-
-			To fix this bug, we will look for grenade entities in map close to player
-			To detect it correctly, these rules must apply:
-				- throwed grenade is always spawned with 40 offset from player origin in Z axis
-				- that greande will blow in exacly 3.8 seconds
-
-			Avoid greande drop if these rules applies!
-			*/
-
-			// Loop grenades in map
-			grenades = getentarray("grenade","classname");
-			grenadeToWatch = undefined;
-			for(i=0;i<grenades.size;i++)
+			if(isDefined(grenades[i].origin))
 			{
-				if(isDefined(grenades[i].origin))
+				distanceZ = grenades[i].origin[2] - self.origin[2];
+				// This grenade is close to player
+				if (distanceZ > 39 && distanceZ < 41) // cooked grenade is always spawned with 40 offset in Z coordinate
 				{
-					distance = distance(grenades[i].origin, self.origin);
-					distanceZ = grenades[i].origin[2] - self.origin[2]; // must be positive
-					// This grenade is close to player
-					if (distance < 50 && distanceZ > 38 && distanceZ < 42)
+					//self iprintln("^1This was cooked grenade! " + distanceZ);
+
+					// Remove this type of grenade from slot so this grenade is not dropped
+					currentGrenadeType = self getcurrentoffhand();
+
+					if (currentGrenadeType != "none")
 					{
-						grenadeToWatch = grenades[i];
-						break;
+						count = self getammocount(currentGrenadeType);
+
+						if (count > 0)
+						{
+							self setWeaponClipAmmo(currentGrenadeType, count - 1); // remove 1 grenade of this type
+
+							//countAfter = self getammocount(currentGrenadeType);
+
+							//self iprintln("^3 Removed 1 grenade of type " + currentGrenadeType + " (before:" + count + " after:" + countAfter + ")");
+						}
 					}
+
+
+					break;
 				}
 			}
-			// There is grenade close to player
-			if (isDefined(grenadeToWatch))
-			{
-				// Wait right before grenade explode
-				wait level.fps_multiplier * 3.5;
+		}
 
-				// Grenade still does not explode - we are sure that this grande is throwed from this player and will explode in a few miliseconds
-				if (isDefined(grenadeToWatch))
-					return; // Cancel extra grenade drop
-			}
 
-			self dropItem(grenadetype);
-			level notify("weapon_dropped", grenadetype, self);
+		// Drop every possible grenade
+		if (self getammocount("frag_grenade_american_mp"))
+		{
+			self dropItem("frag_grenade_american_mp");
+			waittillframeend; // wait before next "weapon_dropped" can be called
+			level notify("weapon_dropped", "frag_grenade_american_mp", self);
+		}
+		if (self getammocount("frag_grenade_british_mp"))
+		{
+			self dropItem("frag_grenade_british_mp");
+			waittillframeend; // wait before next "weapon_dropped" can be called
+			level notify("weapon_dropped", "frag_grenade_british_mp", self);
+		}
+		if (self getammocount("frag_grenade_russian_mp"))
+		{
+			self dropItem("frag_grenade_russian_mp");
+			waittillframeend; // wait before next "weapon_dropped" can be called
+			level notify("weapon_dropped", "frag_grenade_russian_mp", self);
+		}
+		if (self getammocount("frag_grenade_german_mp"))
+		{
+			self dropItem("frag_grenade_german_mp");
+			waittillframeend; // wait before next "weapon_dropped" can be called
+			level notify("weapon_dropped", "frag_grenade_german_mp", self);
 		}
 	}
 }
@@ -776,6 +846,7 @@ dropSmoke()
 
 		if(ammosize) {
 			self dropItem(grenadetype);
+			waittillframeend; // wait before next "weapon_dropped" can be called
 			level notify("weapon_dropped", grenadetype, self);
 		}
 	}
@@ -800,23 +871,23 @@ getWeaponBasedSmokeGrenadeCount(weapon)
 
 getFragGrenadeCount()
 {
-	grenadetype = self GetGrenadeTypeName();
-
-	if (grenadetype == "none")
-		return 0;
-
-	count = self getammocount(grenadetype);
+	// Because player can pickup nades also from enemy team, all grenade types are counted
+	count = 0;
+	count += self getammocount("frag_grenade_american_mp");
+	count += self getammocount("frag_grenade_british_mp");
+	count += self getammocount("frag_grenade_russian_mp");
+	count += self getammocount("frag_grenade_german_mp");
 	return count;
 }
 
 getSmokeGrenadeCount()
 {
-	grenadetype = self GetSmokeTypeName();
-
-	if (grenadetype == "none")
-		return 0;
-
-	count = self getammocount(grenadetype);
+	// Because player can pickup nades also from enemy team, all grenade types are counted
+	count = 0;
+	count += self getammocount("smoke_grenade_american_mp");
+	count += self getammocount("smoke_grenade_british_mp");
+	count += self getammocount("smoke_grenade_russian_mp");
+	count += self getammocount("smoke_grenade_german_mp");
 	return count;
 }
 
@@ -1072,6 +1143,13 @@ getWeaponName2(weapon)
 		weaponname = "Scope";
 		break;
 
+	// Pistols
+	case "colt_mp":
+	case "webley_mp":
+	case "luger_mp":
+	case "TT30_mp":
+		weaponname = "Pistol";
+		break;
 
 	default:
 		weaponname = weapon;
diff --git a/source/maps/mp/gametypes/ctf.gsc b/source/maps/mp/gametypes/ctf.gsc
index 54d02c1..058b7d9 100644
--- a/source/maps/mp/gametypes/ctf.gsc
+++ b/source/maps/mp/gametypes/ctf.gsc
@@ -27,6 +27,7 @@ main()
 	level.allies = ::menuAllies;
 	level.axis = ::menuAxis;
 	level.spectator = ::menuSpectator;
+	level.streamer = ::menuStreamer;
 	level.weapon = ::menuWeapon;
 
 	level.spawnPlayer = ::spawnPlayer;
@@ -87,6 +88,8 @@ precache()
 {
 	precacheStatusIcon(level.hudflag_allies);
 	precacheStatusIcon(level.hudflag_axis);
+	precacheStatusIcon("compassping_enemyfiring");
+
 	precacheShader(level.compassflag_allies);
 	precacheShader(level.compassflag_axis);
 	precacheShader(level.objpointflag_allies);
@@ -321,7 +324,10 @@ onConnected()
 	else
 	{
 		// If is team selected from last round, set the real team variable
-		self.sessionteam = self.pers["team"];
+		team = self.pers["team"];
+		if (team == "streamer")
+			team = "spectator";
+		self.sessionteam = team;
 	}
 
 	// Define default variables specific for this gametype
@@ -353,7 +359,7 @@ onAfterConnected()
 	}
 
 	// Spectator team
-	else if (self.pers["team"] == "spectator")
+	else if (self.pers["team"] == "spectator" || self.pers["team"] == "streamer")
 		spawnSpectator();
 
 	// If team is selected
@@ -711,6 +717,8 @@ spawnSpectator(origin, angles)
 
 	if(self.pers["team"] == "spectator")
 		self.statusicon = "";
+	else if(self.pers["team"] == "streamer")
+		self.statusicon = "compassping_enemyfiring"; // recording icon
 	else if (self.pers["team"] == "allies" || self.pers["team"] == "axis") // dead team spectartor
 		self.statusicon = "hud_status_dead";
 
@@ -735,10 +743,15 @@ spawnSpectator(origin, angles)
 	self notify("spawned");
 
 	// If is real spectator (is in team spectator, not session state spectator)
-	if(self.pers["team"] == "spectator")
+	if (self.pers["team"] == "spectator")
 	{
 		self notify("spawned_spectator");
 	}
+	else if (self.pers["team"] == "streamer")
+	{
+		self notify("spawned_streamer");
+	}
+
 }
 
 spawnIntermission()
@@ -1024,7 +1037,7 @@ endMap()
 
 		player closeMenu();
 		player closeInGameMenu();
-		player setClientCvar("cg_objectiveText", text);
+		player setClientCvar2("cg_objectiveText", text);
 	}
 
 
@@ -1129,7 +1142,7 @@ flag()
 			wait level.fps_multiplier * 1;
 		}
 
-		if(isPlayer(other) && isAlive(other) && (other.pers["team"] != "spectator"))
+		if(isPlayer(other) && isAlive(other) && (other.pers["team"] == "allies" || other.pers["team"] == "axis"))
 		{
 			if(other.pers["team"] == self.team) // Touched by team
 			{
@@ -1572,7 +1585,7 @@ menuAutoAssign()
 	{
 		player = players[i];
 
-		if(player.pers["team"] == "spectator" || player.pers["team"] == "none")
+		if(player.pers["team"] != "allies" && player.pers["team"] != "axis")
 			continue;
 
 		numonteam[player.pers["team"]]++;
@@ -1701,6 +1714,34 @@ menuSpectator()
 	level notify("joined", "spectator", self); // used in first round to check if someone joined team
 }
 
+menuStreamer()
+{
+	if(self.pers["team"] == "streamer")
+		return;
+
+	self.joining_team = "streamer";
+	self.leaving_team = self.pers["team"];
+
+	if(isAlive(self))
+	{
+		self.switching_teams = true;
+		self suicide();
+	}
+
+	self.sessionteam = "spectator";
+	self.statusicon = "";
+	self.pers["team"] = "streamer";
+	self.pers["weapon"] = undefined;
+	self.pers["savedmodel"] = undefined;
+
+	spawnSpectator();
+
+	self notify("joined", "streamer");
+	self notify("joined_streamers");
+
+	level notify("joined", "streamer", self); // used in first round to check if someone joined team
+}
+
 menuWeapon(response)
 {
 	// You has to be "allies" or "axis" to change a weapon
diff --git a/source/maps/mp/gametypes/dm.gsc b/source/maps/mp/gametypes/dm.gsc
index 5fe7d52..752b826 100644
--- a/source/maps/mp/gametypes/dm.gsc
+++ b/source/maps/mp/gametypes/dm.gsc
@@ -27,6 +27,7 @@ main()
 	level.allies = ::menuAllies;
 	level.axis = ::menuAxis;
 	level.spectator = ::menuSpectator;
+	level.streamer = ::menuStreamer;
 	level.weapon = ::menuWeapon;
 
 	level.spawnPlayer = ::spawnPlayer;
@@ -82,6 +83,8 @@ onCvarChanged(cvar, value, isRegisterTime)
 // Is called only once per map
 precache()
 {
+	precacheStatusIcon("compassping_enemyfiring"); // for streamers
+
 	// HUD: Strattime
 	precacheString2("STRING_STRAT_TIME", &"Strat Time");
 }
@@ -288,7 +291,7 @@ onAfterConnected()
 	}
 
 	// Spectator team
-	else if (self.pers["team"] == "spectator")
+	else if (self.pers["team"] == "spectator" || self.pers["team"] == "streamer")
 		spawnSpectator();
 
 	// If team is selected
@@ -555,6 +558,8 @@ spawnSpectator(origin, angles)
 
 	if(self.pers["team"] == "spectator")
 		self.statusicon = "";
+	else if(self.pers["team"] == "streamer")
+		self.statusicon = "compassping_enemyfiring"; // recording icon
 	else if (self.pers["team"] == "allies" || self.pers["team"] == "axis") // dead team spectartor
 		self.statusicon = "hud_status_dead";
 
@@ -580,10 +585,14 @@ spawnSpectator(origin, angles)
 	self notify("spawned");
 
 	// If is real spectator (is in team spectator, not session state spectator)
-	if(self.pers["team"] == "spectator")
+	if (self.pers["team"] == "spectator")
 	{
 		self notify("spawned_spectator");
 	}
+	else if (self.pers["team"] == "streamer")
+	{
+		self notify("spawned_streamer");
+	}
 }
 
 spawnIntermission()
@@ -851,7 +860,7 @@ menuAutoAssign()
 	{
 		player = players[i];
 
-		if(player.pers["team"] == "spectator" || player.pers["team"] == "none")
+		if(player.pers["team"] != "allies" && player.pers["team"] != "axis")
 			continue;
 
 		numonteam[player.pers["team"]]++;
@@ -976,6 +985,34 @@ menuSpectator()
 	level notify("joined", "spectator", self); // used in first round to check if someone joined team
 }
 
+menuStreamer()
+{
+	if(self.pers["team"] == "streamer")
+		return;
+
+	self.joining_team = "streamer";
+	self.leaving_team = self.pers["team"];
+
+	if(isAlive(self))
+	{
+		self.switching_teams = true;
+		self suicide();
+	}
+
+	self.sessionteam = "spectator";
+	self.statusicon = "";
+	self.pers["team"] = "streamer";
+	self.pers["weapon"] = undefined;
+	self.pers["savedmodel"] = undefined;
+
+	spawnSpectator();
+
+	self notify("joined", "streamer");
+	self notify("joined_streamers");
+
+	level notify("joined", "streamer", self); // used in first round to check if someone joined team
+}
+
 menuWeapon(response)
 {
 	// You has to be "allies" or "axis" to change a weapon
diff --git a/source/maps/mp/gametypes/global/_global.gsc b/source/maps/mp/gametypes/global/_global.gsc
index 5cc8442..fd35dbb 100644
--- a/source/maps/mp/gametypes/global/_global.gsc
+++ b/source/maps/mp/gametypes/global/_global.gsc
@@ -57,11 +57,18 @@ isPlayerInSight(player)
 {
 	return maps\mp\gametypes\global\player::isPlayerInSight(player);
 }
+isEntityInSight(entity)
+{
+	return maps\mp\gametypes\global\player::isEntityInSight(entity);
+}
 getLookingAtPosition()
 {
 	return maps\mp\gametypes\global\player::getLookingAtPosition();
 }
-
+getFOV()
+{
+	return maps\mp\gametypes\global\player::getFOV();
+}
 
 /*************************************************************************************************************
 * Cvar system
diff --git a/source/maps/mp/gametypes/global/_init.gsc b/source/maps/mp/gametypes/global/_init.gsc
index dfae0e1..7866221 100644
--- a/source/maps/mp/gametypes/global/_init.gsc
+++ b/source/maps/mp/gametypes/global/_init.gsc
@@ -43,7 +43,6 @@ InitModules()
 
 	thread maps\mp\gametypes\_pam::init();
 	thread maps\mp\gametypes\_force_download::init();
-	thread maps\mp\gametypes\_language::init();
 	thread maps\mp\gametypes\_cvar_forces::init();
 
 	thread maps\mp\gametypes\_log::init();
@@ -86,11 +85,12 @@ InitModules()
 	thread maps\mp\gametypes\_matchinfo::init();	// depends on readyup, teamname, bash, overtime
 	thread maps\mp\gametypes\_record::init();	// depends on matchinfo
 	thread maps\mp\gametypes\_players_left::Init(); // depends on matchinfo
-	thread maps\mp\gametypes\_spectating_auto::init(); // depends on readyup
-	thread maps\mp\gametypes\_spectating_hud::init(); // depends on readyup, matchinfo
-	thread maps\mp\gametypes\_spectating_hud_esp::init(); // depends on readyup, matchinfo
-	thread maps\mp\gametypes\_spectating_hud_damage::init(); // depends on readyup
-	thread maps\mp\gametypes\_spectating_killcam::init(); // depends on _spectating_auto
+	thread maps\mp\gametypes\_spectating_system::init(); // depends on readyup, matchinfo
+	thread maps\mp\gametypes\_spectating_system_auto::init(); // depends on readyup
+	thread maps\mp\gametypes\_spectating_system_hud::init(); // depends on readyup, matchinfo
+	thread maps\mp\gametypes\_spectating_system_xray::init(); // depends on readyup, matchinfo
+	thread maps\mp\gametypes\_spectating_system_damage::init(); // depends on readyup
+	thread maps\mp\gametypes\_spectating_system_killcam::init(); // depends on _spectating_system_auto
 	thread maps\mp\gametypes\_archive::init(); // depends on spectating_system and killcam
 
 
@@ -112,6 +112,7 @@ InitModules()
 	thread maps\mp\gametypes\_score_set::init(); // depends on readyup, halftime, sd
 	thread maps\mp\gametypes\_sniper_shotgun_info::init();
 	thread maps\mp\gametypes\_warnings::init();
+	thread maps\mp\gametypes\_aim_trainer::init();		// depends on readyup
 
 
 	thread maps\mp\gametypes\_objective::init(); // depends on readyup, timeout
diff --git a/source/maps/mp/gametypes/global/cvar_system.gsc b/source/maps/mp/gametypes/global/cvar_system.gsc
index 628b42d..15e6323 100644
--- a/source/maps/mp/gametypes/global/cvar_system.gsc
+++ b/source/maps/mp/gametypes/global/cvar_system.gsc
@@ -303,31 +303,33 @@ setCvarIfChanged(cvar, value)
 
 setClientCvar2(cvar, value, aaa, bbb, ccc)
 {
+	/*
 	/#
-/*
-	if (cvar == "cg_objectiveText")
-      		println("### " + getTime() + " ### " + level.frame_num + " ### " + self.name + " ### " + cvar + " = " + "...localized string...");
-        else
-      		println("### " + getTime() + " ### " + level.frame_num + " ### " + self.name + " ### " + cvar + " = \"" + value + "\"");
-
-	self thread countCvarsInSingleFrame();
-
-
-        if (!isDefined(self.pers["aaa"]))
-        {
-	      	self.pers["aaa"] = [];
-	      	self.pers["sended_cvars"] = 0;
-        }
-
-        if (!isDefined(self.pers["aaa"][cvar]))
-        {
-	      	self.pers["aaa"][cvar] = 1;
-	      	self.pers["sended_cvars"]++;
-
-	      	//println("### new cvars:" + self.pers["sended_cvars"] + "  " + cvar);
-        }
-*/
+	if (!isDefined(self.pers["isTestClient"]) && !maps\mp\gametypes\global\_global::startsWith(cvar, "debug"))
+	{
+		if (cvar == "cg_objectiveText")
+	      		println("### " + getTime() + " ### " + level.frame_num + " ### " + self.name + " ### " + cvar + " = " + "...localized string...");
+	        else
+	      		println("### " + getTime() + " ### " + level.frame_num + " ### " + self.name + " ### " + cvar + " = \"" + value + "\"");
+
+		self thread countCvarsInSingleFrame();
+
+
+	        if (!isDefined(self.pers["aaa"]))
+	        {
+		      	self.pers["aaa"] = [];
+		      	self.pers["sended_cvars"] = 0;
+	        }
+	        if (!isDefined(self.pers["aaa"][cvar]))
+	        {
+		      	self.pers["aaa"][cvar] = 1;
+		      	self.pers["sended_cvars"]++;
+
+		      	//println("### new cvars:" + self.pers["sended_cvars"] + "  " + cvar);
+	        }
+	}
 	#/
+	*/
 
         self setClientCvar(cvar, value);
 }
@@ -344,10 +346,18 @@ countCvarsInSingleFrame()
 	self notify("cvar2_count_end");
 	self endon("cvar2_count_end");
 
-	wait level.frame;
+	for (i = 0; i < 200; i++)
+	{
+		resettimeout();
+		waittillframeend;
+	}
 
-	if (self.cvars2_count > 20)
-		println(self.name + ": sended cvars in frame " + gettime() + ": " + self.cvars2_count + " (defined cvars: "+self.pers["sended_cvars"]+")");
+	if (self.cvars2_count > 1)
+	{
+		println("-----------------------------------------------------------------------------------");
+		println("### " + getTime() + " ### " + (level.frame_num-1) + " ### " + self.name + " ### sended cvars: " + self.cvars2_count + " (defined cvars: "+self.pers["sended_cvars"]+")");
+		println("-----------------------------------------------------------------------------------");
+	}
 
 	self.cvars2_count = 0;
 }
diff --git a/source/maps/mp/gametypes/global/cvars.gsc b/source/maps/mp/gametypes/global/cvars.gsc
index 07e68d0..48d396c 100644
--- a/source/maps/mp/gametypes/global/cvars.gsc
+++ b/source/maps/mp/gametypes/global/cvars.gsc
@@ -158,7 +158,7 @@ onCvarChanged(cvar, value, isRegisterTime)
 		case "g_voicechattalkingduration":	return true;
 		case "g_voteabstainweight":		return true;
 		case "g_weaponammopools":		return true;
-		case "g_debugdamage":			level.debugDamage = value; return true;
+		case "g_debugdamage":			level.g_debugDamage = value; return true;
 		case "packetdebug":			return true;
 		case "player_togglebinoculars":		return true;
 		case "sv_allowanonymous":		return true;
@@ -262,7 +262,7 @@ ResetCheatCvars()
 	setCvar("player_meleeWidth", "10");
     	setCvar("player_moveThreshhold", "10");	// read-only
 	setCvar("player_scopeExitOnDamage", "0");
-	setCvar("player_spectateSpeedScale", "2");	
+	setCvar("player_spectateSpeedScale", "2");
 	setCvar("player_strafeSpeedScale", "0.8");// pohyb do stran
 
 	setCvar("player_turnAnims", "0");
diff --git a/source/maps/mp/gametypes/global/developer.gsc b/source/maps/mp/gametypes/global/developer.gsc
index 040cc87..0aada38 100644
--- a/source/maps/mp/gametypes/global/developer.gsc
+++ b/source/maps/mp/gametypes/global/developer.gsc
@@ -18,8 +18,10 @@ init()
   	//addEventListener("onConnected",     ::onConnected);
 	//addEventListener("onConnected",     ::onConnected2);
 	//addEventListener("onConnected",     ::onConnected3);
+	//addEventListener("onConnected",     ::onConnected4);
 
-
+	//level thread measuring_test();
+	//level thread measuring_test2();
 
 
 /*
@@ -81,21 +83,38 @@ ERROR: File neco.iwd.iwd not found on server for auto-downloading.
 
 	//level thread loop();
 
+
+	//println("running tests");
 }
 
-loop()
+
+
+
+onConnected4()
 {
-	precacheString(&"PAM_TEST");
-	wait level.frame * 3;
+	self endon("disconnect");
+
+	setcvar("client", -1);
 
+	wait level.fps_multiplier * 1;
+/*
 	for(;;)
 	{
-		iprintln(&"PAM_TEST");
-		iprintln("Muj ahoj");
+		self setClientCvarIfChanged("ui_serverinfo_hud",
+		"self.spectatorclient = " + self.spectatorclient + "\n" +
+		"self.sessionstate = " + self.sessionstate + "\n" +
+		"level.spectatingSystem_playerID = " + level.spectatingSystem_playerID + "\n" +
+		"self.spectatingSystem_turnedOn = " + self.spectatingSystem_turnedOn + "\n" +
+		"self.spectatingSystem_freeSpectating = " + self.spectatingSystem_freeSpectating + "\n" +
+		"self.spectatingSystem_inCinematic = " + self.spectatingSystem_inCinematic + "\n" +
+		"level.spectatingSystem_playerID = " + level.spectatingSystem_playerID + "\n" +
+		"level.spectatingSystem_auto_runThreads = " + level.spectatingSystem_auto_runThreads + "\n" +
+
+		"");
 
-		wait level.fps_multiplier * 1;
+		wait level.frame;
 	}
-
+*/
 }
 
 onConnected3()
@@ -251,77 +270,72 @@ bots()
 
 
 
-key()
-{
-	setCvar("id", -1);
 
-	for(;;)
+measuring_test()
+{
+	level.i1 = 0;
+	time = gettime();
+	for (i = 0; ; i++)
 	{
+		//if (isDefined(level.fps_multiplier))	println(gettime() + " test> frame " + i + "  sv_fps:" + getcvar("sv_fps") + "  fps_mult:" + level.fps_multiplier + "  frame:" + level.frame);
+		//else					println(gettime() + " test> frame " + i + "  sv_fps:" + getcvar("sv_fps"));
+
 		wait level.frame;
 
-		id = getCvarInt("id");
+		//println(gettime() + "  " + i);
 
-		if (id != -1)
+		if (gettime() - time != level.frame * 1000)
 		{
-			players = getentarray("player", "classname");
-			for(p = 0; p < players.size; p++)
-			{
-				player = players[p];
-				if (player.pers["team"] == "spectator")
-				{
-					player.spectatorclient = id;
-
-					player allowSpectateTeam("allies", true);
-					player allowSpectateTeam("axis", true);
-					player allowSpectateTeam("freelook", true);
-					player allowSpectateTeam("none", true);
+			println("Time " + (gettime() - time));
+		}
 
-					player iprintln("spectate id " + id);
-				}
-			}
+		level.i1 = i;
 
-			setcvar("id", -1);
-		}
+		time = gettime();
 	}
 }
 
-lang()
-{
-	setCvar("lang", -1);
 
-	for(;;)
+measuring_test2()
+{
+	level.i2 = 0;
+	time = gettime();
+	for (i = 0; ; i++)
 	{
-		wait level.frame;
+		//if (isDefined(level.fps_multiplier))	println(gettime() + " test2> frame " + i + "  sv_fps:" + getcvar("sv_fps") + "  fps_mult:" + level.fps_multiplier + "  frame:" + level.frame);
+		//else					println(gettime() + " test2> frame " + i + "  sv_fps:" + getcvar("sv_fps"));
 
-		id = getCvarInt("lang");
+		if (isDefined(level.frame))
+			wait level.frame;
+		else
+			wait 0.000001;
 
-		if (id != -1)
+		level.i2 = i;
+/*
+		if (level.i1 - level.i2 > 1)
 		{
-			players = getentarray("player", "classname");
-			for(p = 0; p < players.size; p++)
-			{
-				player = players[p];
-				if (1)
-				{
-					player setClientCvar("loc_language", id);
-
-					player iprintln("lang " + id);
-				}
-			}
-
-			setcvar("lang", -1);
+			println("Mismatch i1 != i2  " + level.i1 + " != " + level.i2);
 		}
+*/
+		if (gettime() - time != level.frame * 1000)
+		{
+			println("Time " + (gettime() - time));
+		}
+
+		time = gettime();
 	}
 }
-lang_force()
+
+
+key()
 {
-	setCvar("lang_force", -1);
+	setCvar("id", -1);
 
 	for(;;)
 	{
 		wait level.frame;
 
-		id = getCvarInt("lang_force");
+		id = getCvarInt("id");
 
 		if (id != -1)
 		{
@@ -329,20 +343,27 @@ lang_force()
 			for(p = 0; p < players.size; p++)
 			{
 				player = players[p];
-				if (1)
+				if (player.pers["team"] == "spectator")
 				{
-					player setClientCvar("loc_forceEnglish", id);
+					player.spectatorclient = id;
 
-					player iprintln("loc_forceEnglish " + id);
+					player allowSpectateTeam("allies", true);
+					player allowSpectateTeam("axis", true);
+					player allowSpectateTeam("freelook", true);
+					player allowSpectateTeam("none", true);
+
+					player iprintln("spectate id " + id);
 				}
 			}
 
-			setcvar("lang_force", -1);
+			setcvar("id", -1);
 		}
 	}
 }
 
 
+
+
 skipReadyup()
 {
 	//wait level.fps_multiplier * .1;
@@ -357,9 +378,14 @@ skipReadyup()
 }
 
 
-showWaypoint(player)
+showWaypoint(player, size)
 {
-	origin = self getOrigin();
+	origin = self.origin;
+	if (isPlayer(self))
+		origin = self getOrigin();
+
+	if (!isDefined(size))
+		size = 2;
 
 	waypoint = undefined;
 	if (isDefined(player))
@@ -375,7 +401,7 @@ showWaypoint(player)
 	self.waypoint.alpha = 1;
 	self.waypoint.archived = false;
 	if (isDefined(self.waypoint_color)) self.waypoint.color = self.waypoint_color;
-	self.waypoint setShader("objpoint_default", 2, 2);
+	self.waypoint setShader("objpoint_default", size, size);
 	self.waypoint setwaypoint(true);
 
 	for (;;)
@@ -389,7 +415,12 @@ showWaypoint(player)
 		if (!isDefined(self))
 			break;
 
-		origin = self getOrigin();
+		origin = self.origin;
+		if (isPlayer(self))
+			origin = self getOrigin();
+
+		if (!isDefined(self.waypoint))
+			return;
 
 		self.waypoint.x = origin[0];
 		self.waypoint.y = origin[1];
@@ -1030,14 +1061,7 @@ onConnected()
 
 	wait level.fps_multiplier * 1.0;
 
-	//self thread showWaypoint();
-
 
-	//thread testTime1();
-	//thread testTime2();
-	//thread testTime3();
-
-	thread angledebug();
 
 	//self iprintln("ClientID: " + self getEntityNumber());
 
@@ -1045,10 +1069,6 @@ onConnected()
 		return;
 	self.pers["_temp_"] = true;
 
-	//self openMenu(game["menu_scoreboard"]);
-	//self closeMenu();
-	//self closeInGameMenu();
-
 
 	self.pers["killer"] = 1;
 
@@ -1058,7 +1078,9 @@ onConnected()
     	self notify("menuresponse", game["menu_serverinfo"], "close");
     	wait level.frame;
 
-	i = 0;
+	i = 1;
+
+
 
 	if (i == 0)
 	{
@@ -1073,20 +1095,25 @@ onConnected()
 			wait level.fps_multiplier * 4;
 
 			//setCvar("scr_sd_roundlength", 10);
-			//thread skipReadyup();
+			setCvar("scr_sd_PlantTime", 1);
+			setCvar("scr_sd_strat_time", 1);
+
+			thread skipReadyup();
 		}
 	}
 	else if (i==1)
 	{
 		if (self.name == "client_1 ")
 		{
-			self notify("menuresponse", game["menu_team"], "spectator");
+			self notify("menuresponse", game["menu_team"], "streamer");
 
-			setCvar("scr_bots_add", 1);
+			setCvar("scr_bots_add", 0);
 			setCvar("scr_sd_roundlength", 10);
+			setCvar("scr_sd_PlantTime", 1);
+			//setCvar("scr_sd_strat_time", 1);
 
 
-			wait level.fps_multiplier * 5.5;
+			wait level.fps_multiplier * 3.5;
 
 
 
@@ -1185,35 +1212,4 @@ onConnected()
 		}
 	}
 
-
-	wait level.frame*5;
-
-
-	//self notify("menuresponse", "ingame", "serveroptions");
-	wait level.frame;
-	//self notify("menuresponse", "server_options", "open");
-
-
-
-
-        wait level.fps_multiplier * 0.5;
-
-/*
-        self.sessionstate = "playing";
-
-        spawnpointname = "mp_global_intermission";
-    		spawnpoints = getentarray(spawnpointname, "classname");
-    		spawnpoint = maps\mp\gametypes\_spawnlogic::getSpawnpoint_Random(spawnpoints);
-
-    		if(isdefined(spawnpoint))
-    			self spawn(spawnpoint.origin, spawnpoint.angles);
-
-
-        // Link script_model to grenade from players position offset
-      	self.hilfsObjekt = spawn("script_model", spawnpoint.origin);
-      	self.hilfsObjekt.angles = spawnpoint.angles;
-      	self linkto(self.hilfsObjekt);
-*/
-
-
 }
diff --git a/source/maps/mp/gametypes/global/events.gsc b/source/maps/mp/gametypes/global/events.gsc
index 5502e15..69de425 100644
--- a/source/maps/mp/gametypes/global/events.gsc
+++ b/source/maps/mp/gametypes/global/events.gsc
@@ -18,10 +18,12 @@ Init()
 	level.events.onSpawned = [];
 	level.events.onSpawnedPlayer = [];
 	level.events.onSpawnedSpectator = [];
+	level.events.onSpawnedStreamer = [];
 	level.events.onSpawnedIntermission = [];
 	level.events.onJoinedTeam = [];
 	level.events.onJoinedAlliesAxis = [];
 	level.events.onJoinedSpectator = [];
+	level.events.onJoinedStreamer = [];
 	level.events.onPlayerDamaging = [];
 	level.events.onPlayerDamaged = [];
 	level.events.onPlayerKilling = [];
@@ -34,18 +36,20 @@ Init()
 	/#
 	addListener("onStartGameType",    	::onStartGameType);
 
-	addListener("onConnecting",    	::onConnecting);
-	addListener("onConnected",     	::onConnected);
+	addListener("onConnecting",    		::onConnecting);
+	addListener("onConnected",     		::onConnected);
 	addListener("onConnectedAll",     	::onConnectedAll);
-	addListener("onDisconnect",    	::onDisconnect);
+	addListener("onDisconnect",    		::onDisconnect);
 
-	addListener("onSpawned",           ::onSpawned);
-	addListener("onSpawnedPlayer",     ::onSpawnedPlayer);
-	addListener("onSpawnedSpectator",  ::onSpawnedSpectator);
+	addListener("onSpawned",           	::onSpawned);
+	addListener("onSpawnedPlayer",     	::onSpawnedPlayer);
+	addListener("onSpawnedSpectator",  	::onSpawnedSpectator);
+	addListener("onSpawnedStreamer",  	::onSpawnedStreamer);
 
-	addListener("onJoinedTeam",        ::onJoinedTeam);
-	addListener("onJoinedAlliesAxis",  ::onJoinedAlliesAxis);
-	addListener("onJoinedSpectator",   ::onJoinedSpectator);
+	addListener("onJoinedTeam",        	::onJoinedTeam);
+	addListener("onJoinedAlliesAxis",  	::onJoinedAlliesAxis);
+	addListener("onJoinedSpectator",   	::onJoinedSpectator);
+	addListener("onJoinedStreamer",   	::onJoinedStreamer);
 
 	addListener("onPlayerKilling",   	::onPlayerKilling);
 	addListener("onPlayerKilled",   	::onPlayerKilled);
@@ -79,6 +83,8 @@ addListener(eventName, funcPointer)
 		level.events.onSpawnedPlayer[level.events.onSpawnedPlayer.size] = funcPointer;
 	else if (eventName == "onSpawnedSpectator")
 		level.events.onSpawnedSpectator[level.events.onSpawnedSpectator.size] = funcPointer;
+	else if (eventName == "onSpawnedStreamer")
+		level.events.onSpawnedStreamer[level.events.onSpawnedStreamer.size] = funcPointer;
 	else if (eventName == "onSpawnedIntermission")
 		level.events.onSpawnedIntermission[level.events.onSpawnedIntermission.size] = funcPointer;
 
@@ -88,6 +94,8 @@ addListener(eventName, funcPointer)
 		level.events.onJoinedAlliesAxis[level.events.onJoinedAlliesAxis.size] = funcPointer;
 	else if (eventName == "onJoinedSpectator")
 		level.events.onJoinedSpectator[level.events.onJoinedSpectator.size] = funcPointer;
+	else if (eventName == "onJoinedStreamer")
+		level.events.onJoinedStreamer[level.events.onJoinedStreamer.size] = funcPointer;
 
 	else if (eventName == "onPlayerDamaging")
 		level.events.onPlayerDamaging[level.events.onPlayerDamaging.size] = funcPointer;
@@ -130,11 +138,13 @@ notifyConnected()
 	self thread _onSpawned();
 	self thread _onSpawnedPlayer();
 	self thread _onSpawnedSpectator();
+	self thread _onSpawnedStreamer();
 	self thread _onSpawnedIntermission();
 
 	self thread _onJoinedTeam();
 	self thread _onJoinedAlliesAxis();
 	self thread _onJoinedSpectator();
+	self thread _onJoinedStreamer();
 
 	self thread _onMenuResponse();
 
@@ -226,6 +236,8 @@ _onSpawned()
 }
 _onSpawnedCallEvents()
 {
+	// Resets the infinite loop check timer, to prevent an incorrect infinite loop error when a lot of script must be run
+	resettimeout();
 	for (i = 0; i < level.events.onSpawned.size; i++)
 		self thread [[level.events.onSpawned[i]]]();
 }
@@ -242,6 +254,8 @@ _onSpawnedPlayer()
 }
 _onSpawnedPlayerCallEvents()
 {
+	// Resets the infinite loop check timer, to prevent an incorrect infinite loop error when a lot of script must be run
+	resettimeout();
 	for (i = 0; i < level.events.onSpawnedPlayer.size; i++)
 		self thread [[level.events.onSpawnedPlayer[i]]]();
 }
@@ -258,11 +272,31 @@ _onSpawnedSpectator()
 }
 _onSpawnedSpectatorCallEvents()
 {
+	// Resets the infinite loop check timer, to prevent an incorrect infinite loop error when a lot of script must be run
+	resettimeout();
 	for (i = 0; i < level.events.onSpawnedSpectator.size; i++)
 		self thread [[level.events.onSpawnedSpectator[i]]]();
 }
 
 
+_onSpawnedStreamer()
+{
+	self endon("disconnect");
+	for(;;)
+	{
+		self waittill("spawned_streamer");
+		self thread _onSpawnedStreamerCallEvents();
+	}
+}
+_onSpawnedStreamerCallEvents()
+{
+	// Resets the infinite loop check timer, to prevent an incorrect infinite loop error when a lot of script must be run
+	resettimeout();
+	for (i = 0; i < level.events.onSpawnedStreamer.size; i++)
+		self thread [[level.events.onSpawnedStreamer[i]]]();
+}
+
+
 _onSpawnedIntermission()
 {
 	self endon("disconnect");
@@ -274,6 +308,8 @@ _onSpawnedIntermission()
 }
 _onSpawnedIntermissionCallEvents()
 {
+	// Resets the infinite loop check timer, to prevent an incorrect infinite loop error when a lot of script must be run
+	resettimeout();
 	for (i = 0; i < level.events.onSpawnedIntermission.size; i++)
 		self thread [[level.events.onSpawnedIntermission[i]]]();
 }
@@ -290,6 +326,8 @@ _onJoinedTeam()
 }
 _onJoinedTeamCallEvents(teamName)
 {
+	// Resets the infinite loop check timer, to prevent an incorrect infinite loop error when a lot of script must be run
+	resettimeout();
 	for (i = 0; i < level.events.onJoinedTeam.size; i++)
 		self thread [[level.events.onJoinedTeam[i]]](teamName);
 }
@@ -306,6 +344,8 @@ _onJoinedAlliesAxis()
 }
 _onJoinedAlliesAxisCallEvents()
 {
+	// Resets the infinite loop check timer, to prevent an incorrect infinite loop error when a lot of script must be run
+	resettimeout();
 	for (i = 0; i < level.events.onJoinedAlliesAxis.size; i++)
 		self thread [[level.events.onJoinedAlliesAxis[i]]]();
 }
@@ -322,11 +362,32 @@ _onJoinedSpectator()
 }
 _onJoinedSpectatorCallEvents()
 {
+	// Resets the infinite loop check timer, to prevent an incorrect infinite loop error when a lot of script must be run
+	resettimeout();
 	for (i = 0; i < level.events.onJoinedSpectator.size; i++)
 		self thread [[level.events.onJoinedSpectator[i]]]();
 }
 
 
+_onJoinedStreamer()
+{
+	self endon("disconnect");
+	for(;;)
+	{
+		self waittill("joined_streamers");
+		self thread _onJoinedStreamerCallEvents();
+	}
+}
+_onJoinedStreamerCallEvents()
+{
+	// Resets the infinite loop check timer, to prevent an incorrect infinite loop error when a lot of script must be run
+	resettimeout();
+	for (i = 0; i < level.events.onJoinedStreamer.size; i++)
+		self thread [[level.events.onJoinedStreamer[i]]]();
+}
+
+
+
 _onMenuResponse()
 {
 	self endon("intermission");
@@ -336,12 +397,18 @@ _onMenuResponse()
 	{
 		self waittill("menuresponse", menu, response);
 
+		/#
+		println("##### " + gettime() + " " + level.frame_num + " ##### menuresponse("+menu+", "+response+"): " + self.name);
+		#/
+
 		// Process events
 		self thread _onMenuResponseCallEvents(menu, response);
 	}
 }
 _onMenuResponseCallEvents(menu, response)
 {
+	// Resets the infinite loop check timer, to prevent an incorrect infinite loop error when a lot of script must be run
+	resettimeout();
 	// Call events one by one and if true is returned, it means menuresponse was handled and no other events need to be called
 	for (i = 0; i < level.events.onMenuResponse.size; i++)
 	{
@@ -421,6 +488,11 @@ onSpawnedSpectator()
     if (getCvar("debug") == "1") self iprintln(GetTime() + ": ^6CATCHED: spawned_spectator, "+self.name);
 }
 
+onSpawnedStreamer()
+{
+    if (getCvar("debug") == "1") self iprintln(GetTime() + ": ^6CATCHED: spawned_streamer, "+self.name);
+}
+
 onJoinedTeam(teamName)
 {
     if (getCvar("debug") == "1") self iprintln(GetTime() + ": ^6CATCHED: joined("+teamName+"), "+self.name);
@@ -436,6 +508,11 @@ onJoinedSpectator()
     if (getCvar("debug") == "1") self iprintln(GetTime() + ": ^6CATCHED: joined_spectators, "+self.name);
 }
 
+onJoinedStreamer()
+{
+    if (getCvar("debug") == "1") self iprintln(GetTime() + ": ^6CATCHED: joined_streamers, "+self.name);
+}
+
 onPlayerKilling(eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, timeOffset, deathAnimDuration)
 {
     if (getCvar("debug") == "1") self iprintln(GetTime() + ": ^6CATCHED: onPlayerKilling, "+self.name);
diff --git a/source/maps/mp/gametypes/global/hud_system.gsc b/source/maps/mp/gametypes/global/hud_system.gsc
index d503481..3f5f947 100644
--- a/source/maps/mp/gametypes/global/hud_system.gsc
+++ b/source/maps/mp/gametypes/global/hud_system.gsc
@@ -220,53 +220,7 @@ SetPlayerWaypoint(camera_player, waypoint_player)
 			}
 		}
 
-		fov = 80;
-		if (isAlive(camera_player_real))
-		{
-			weapon_fov["m1carbine_mp"] = 55;
-			weapon_fov["m1garand_mp"] = 50;
-			weapon_fov["thompson_mp"] = 65;
-			weapon_fov["bar_mp"] = 50;
-			weapon_fov["springfield_mp"] = 15;
-			weapon_fov["greasegun_mp"] = 65;
-			weapon_fov["shotgun_mp"] = 65;
-			weapon_fov["enfield_mp"] = 50;
-			weapon_fov["sten_mp"] = 65;
-			weapon_fov["bren_mp"] = 50;
-			weapon_fov["enfield_scope_mp"] = 15;
-			weapon_fov["mosin_nagant_mp"] = 50;
-			weapon_fov["SVT40_mp"] = 50;
-			weapon_fov["PPS42_mp"] = 65;
-			weapon_fov["ppsh_mp"] = 65;
-			weapon_fov["mosin_nagant_sniper_mp"] = 15;
-			weapon_fov["kar98k_mp"] = 50;
-			weapon_fov["g43_mp"] = 50;
-			weapon_fov["mp40_mp"] = 65;
-			weapon_fov["mp44_mp"] = 50;
-			weapon_fov["kar98k_sniper_mp"] = 15;
-			weapon_fov["colt_mp"] = 80;
-			weapon_fov["luger_mp"] = 80;
-			weapon_fov["tt30_mp"] = 80;
-			weapon_fov["webley_mp"] = 80;
-			weapon_fov["mg_mp"] = 60;
-
-			current = camera_player_real getcurrentweapon(); // can be none
-			zoom = camera_player_real playerAds();	// 1 = zoom | 0 = no zoom
-
-			if (camera_player_real.usingMG)
-			{
-				current = "mg_mp";
-				zoom = 1;
-			}
-
-			if (zoom < 0.5)
-				zoom = 0;
-			else
-				zoom = (zoom*2)-1;
-
-			if (isDefined(weapon_fov[current]))
-				fov = 80 - (80 - weapon_fov[current]) * zoom;
-		}
+		fov = camera_player_real maps\mp\gametypes\global\player::getFOV();
 
 		waypoint_origin = waypoint_player.origin + self.offset;
 		if (isDefined(self.tag) && self.tag == "head")
@@ -285,6 +239,8 @@ SetPlayerWaypoint(camera_player, waypoint_player)
 		last_x = point[0];
 		last_y = point[1];
 		*/
+
+
 		// Shader set
 		if (isDefined(self.shader) && self.shader != "")
 		{
@@ -315,6 +271,8 @@ abs (num)
 	return num;
 }
 
+
+
 WorldToScreen(camera_origin, camera_angles, position, fov_scale)
 {
 	width = 640;
@@ -322,33 +280,224 @@ WorldToScreen(camera_origin, camera_angles, position, fov_scale)
 	fov_x = 80 * fov_scale;
 	fov_y = 63 * fov_scale;	// 63 - i dont know how its computed
 
-	left = anglestoright(camera_angles);
+	right = anglestoright(camera_angles);
+	up = anglestoup(camera_angles);
+	forward = anglestoforward(camera_angles);
+
+	relativePos = vectornormalize(position - camera_origin);
+
+        forwardDot = VectorDot(relativePos, forward);
+        rightDot = VectorDot(relativePos, right);
+        upDot = VectorDot(relativePos, up);
+
+	// Avoid devision by 0
+	if (forwardDot == 0) forwardDot = 0.001;
+
+	// Calculate screen position
+        x = (width / 2) * (1 + (rightDot / tan(fov_x/2) / forwardDot));
+        y = (height / 2) * (1 - (upDot / tan(fov_y/2) / forwardDot));
+
+	// Point is behind camera, move it offscreen
+	if (forwardDot <= 0)
+	{
+		if (x < width / 2)	x = width * 2;
+		else 			x = width * -1;
+	}
+
+	ret[0] = x;
+	ret[1] = y;
+	return ret;
+}
+
+
+WorldToScreen2(camera_origin, camera_angles, position, fov_scale)
+{
+	width = 640;
+	height = 480;
+	fov_x = 80 * fov_scale;
+	fov_y = 63 * fov_scale;	// 63 - i dont know how its computed
+
+	right = anglestoright(camera_angles);
 	up = anglestoup(camera_angles);
 	forward = anglestoforward(camera_angles);
 
-	Position = position - camera_origin;
-        Transform[0] = VectorDot(Position, left);
-        Transform[1] = VectorDot(Position, up);
-        Transform[2] = VectorDot(Position, forward);
+	relativePos = position - camera_origin;
+	relativePosNorm = vectornormalize(relativePos);
 
+        forwardDot = VectorDot(relativePos, forward);
+        rightDot = VectorDot(relativePos, right);
+        upDot = VectorDot(relativePos, up);
+/*
         // make sure it is in front of us
-        if (Transform[2] < 0.1)
+        if (forwardDot < 0.1)
 	{
 		ret[0] = -1000;
 	        ret[1] = -1000;
 		return ret;
 	}
+*/
+    // Check if the point is behind the camera
+    if (forwardDot <= 0) {
+
+        farPoint = vectoradd(camera_origin, vectorscale(forward, 1000));
+
+        relativePosNorm = vectornormalize(farPoint - camera_origin);
+
+        forwardDot = VectorDot(forward, relativePosNorm);
+        rightDot = VectorDot(right, relativePosNorm);
+        upDot = VectorDot(up, relativePosNorm);
+    }
+
+	// Calculate screen position
+        x = (width * 0.5) * (1 - (rightDot / tan(fov_x/2) / forwardDot));
+        y = (height * 0.5) * (1 - (upDot / tan(fov_y/2) / forwardDot));
+
+	x = width - x; // flip x
+
+	// check if target point is outside viewable screen area
+	if (x < 0.0 || x > 640.0 || y < 0.0 || y > 480.0)
+	{
+		    halfFOVH = fov_x / 2;
+		    halfFOVV = fov_y / 2;
+		    tanHalfFOVH = tan(halfFOVH);
+		    tanHalfFOVV = tan(halfFOVV);
+		    aspectRatio = width / height;
+
+	        // Compute the edge of the screen that is closest to the 3D point
+	        edgePoint = position;
+	        edgeDist = distance(position, camera_origin);
+	        edgeX = width / 2 + (rightDot / tanHalfFOVH) * height / aspectRatio / 2;
+	        edgeY = height / 2 - (upDot / tanHalfFOVV) * height / 2;
+
+	        // Check the left edge
+	        leftX = 0;
+	        leftY = height / 2 - (upDot / tanHalfFOVV) * height / 2;
+	        leftPoint = vectoradd(camera_origin, vectorscale(forward, (leftX - width / 2) / (rightDot / tanHalfFOVH)));
+	        leftDist = distance(leftPoint, position);
+	        if (leftDist < edgeDist) {
+	            edgePoint = leftPoint;
+	            edgeDist = leftDist;
+	            edgeX = leftX;
+	            edgeY = leftY;
+	        }
+
+	        // Check the right edge
+	        rightX = width;
+	        rightY = height / 2 - (upDot / tanHalfFOVV) * height / 2;
+	        rightPoint = vectoradd(camera_origin, vectorscale(forward, (rightX - width / 2) / (rightDot / tanHalfFOVH)));
+		rightDist = distance(rightPoint, position);
+		if (rightDist < edgeDist) {
+			edgePoint = rightPoint;
+			edgeDist = rightDist;
+			edgeX = rightX;
+			edgeY = rightY;
+		}
+
+		// Check the top edge
+		topX = width / 2 + (rightDot / tanHalfFOVH) * height / aspectRatio / 2;
+		topY = 0;
+		topPoint = vectoradd(camera_origin, vectorscale(up, (topY - height / 2) / (upDot / tanHalfFOVV)));
+		topDist = distance(topPoint, position);
+		if (topDist < edgeDist) {
+			edgePoint = topPoint;
+			edgeDist = topDist;
+			edgeX = topX;
+			edgeY = topY;
+		}
+
+		// Check the bottom edge
+		bottomX = width / 2 + (rightDot / tanHalfFOVH) * height / aspectRatio / 2;
+		bottomY = height;
+		bottomPoint = vectoradd(camera_origin, vectorscale(up, (bottomY - height / 2) / (upDot / tanHalfFOVV)));
+		bottomDist = distance(bottomPoint, position);
+		if (bottomDist < edgeDist) {
+			edgePoint = bottomPoint;
+			edgeDist = bottomDist;
+			edgeX = bottomX;
+			edgeY = bottomY;
+		}
 
-        ret[0] = (width * 0.5) * (1 - (Transform[0] / tan(fov_x/2) / Transform[2]));
-        ret[1] = (height * 0.5) * (1 - (Transform[1] / tan(fov_y/2) / Transform[2]));
 
-	ret[0] = width - ret[0]; // flip x
+		// Compute the screen coordinates of the edge point
+		edgeScreenX = edgeX;
+		edgeScreenY = edgeY;
+		if (edgeX < 0) {
+			edgeScreenY = height / 2 - (upDot / tanHalfFOVV) * edgeX / (rightDot / tanHalfFOVH) / aspectRatio;
+			edgeScreenX = 0;
+		} else if (edgeX > width) {
+			edgeScreenY = height / 2 + (upDot / tanHalfFOVV) * (edgeX - width) / (rightDot / tanHalfFOVH) / aspectRatio;
+			edgeScreenX = width;
+		}
+		if (edgeY < 0) {
+			edgeScreenX = width / 2 + (rightDot / tanHalfFOVH) * edgeY / (upDot / tanHalfFOVV);
+			edgeScreenY = 0;
+		} else if (edgeY > height) {
+			edgeScreenX = width / 2 + (rightDot / tanHalfFOVH) * (edgeY - height) / (upDot / tanHalfFOVV);
+			edgeScreenY = height;
+		}
 
-	//iprintln(ret[0] + " " + ret[1]);
+			ret[0] = edgeScreenX;
+			ret[1] = edgeScreenY;
+			return ret;
+	}
+/*
+   // Check if the waypoint is outside the screen bounds
+    if (x < 0) {
+        x = 0;
+    } else if (x > 640) {
+        x = 640;
+    }
+
+    if (y < 0) {
+        y = 0;
+    } else if (y > 480) {
+        y = 480;
+    }
+*/
 
+	//aspectRatio = width / height;
+/*
+    // Check if the waypoint is outside the screen bounds and adjust it if necessary
+    if (x < 0) {
+        newX = 0;
+        newZ = (newX - width / 2) * aspectRatio / height * tan(fov_x/2);
+        newPoint = vectoradd(camera_origin, vectorscale(forward, newZ / forwardDot));
+	return WorldToScreen(camera_origin, camera_angles, newPoint, fov_scale);
+    } else if (x > width) {
+        newX = width;
+        newZ = (newX - width / 2) * aspectRatio / height * tan(fov_x/2);
+        newPoint = vectoradd(camera_origin, vectorscale(forward, newZ / forwardDot));
+        return WorldToScreen(camera_origin, camera_angles, newPoint, fov_scale);
+    }
+
+   if (y < 0) {
+        newY = 0;
+        newZ = -1 * (newY - height / 2) * tan(fov_y/2);
+        newPoint = vectoradd(camera_origin, vectorscale(forward, newZ / forwardDot));
+        return WorldToScreen(camera_origin, camera_angles, newPoint, fov_scale);
+    } else if (y > height) {
+        newY = height;
+        newZ = -1 * (newY - height / 2) * tan(fov_y/2);
+        newPoint = vectoradd(camera_origin, vectorscale(forward, newZ / forwardDot));
+        return WorldToScreen(camera_origin, camera_angles, newPoint, fov_scale);
+}*/
+
+
+	ret[0] = x;
+	ret[1] = y;
 	return ret;
 }
 
+vectoradd(v1, v2)
+{
+	return v1 + v2;
+}
+
+
+vectorscale(v1, multiplier)
+{
+	return (v1[0] * multiplier, v1[1] * multiplier, v1[2] * multiplier);
+}
 
 watchArchived()
 {
diff --git a/source/maps/mp/gametypes/global/pam.gsc b/source/maps/mp/gametypes/global/pam.gsc
index 81b76fc..6eb8c23 100644
--- a/source/maps/mp/gametypes/global/pam.gsc
+++ b/source/maps/mp/gametypes/global/pam.gsc
@@ -35,7 +35,7 @@ init()
 	}
 
 
-	level.pam_folder = "main/zpam332"; // ZPAM_RENAME
+	level.pam_folder = "main/zpam333_lan"; // ZPAM_RENAME
 	level.pam_map_iwd = "zpam_maps_v2";
 
 	level.pam_mode_change = false;
@@ -85,10 +85,38 @@ onCvarChanged(cvar, value, isRegisterTime)
 onStartGameType()
 {
 	level thread CheckInstallation();
+
+	// IP protection TODO delayed
+	//level thread Scoreboard_IP_protection();
 }
 
+/* TODO delayed
+Scoreboard_IP_protection()
+{
+	while (1)
+	{
+		value = getcvar("sv_hostname");
+
+		valueNoColor = removeColorsFromString(value);
+
+		if (valueNoColor.size < 140)
+		{
+			value = value + "  ^00|";
+
+			for (i = valueNoColor.size; i < 140; i++)
+			{
+				value = value + "@";
+			}
+
+			value = value + "|";
 
+			setcvar("sv_hostname", value);
+		}
 
+		wait level.fps_multiplier * .5;
+	}
+
+}*/
 
 CheckInstallation()
 {
@@ -211,6 +239,17 @@ CheckInstallation()
 		maps[maps.size] = "mp_breakout_tls";
 		maps[maps.size] = "mp_vallente";
 		maps[maps.size] = "wawa_3daim";
+		/*
+		maps[maps.size] = "mp_toujane_fix"; TODO
+		maps[maps.size] = "mp_burgundy_fix";
+		maps[maps.size] = "mp_dawnville_fix";
+		maps[maps.size] = "mp_matmata_fix";
+		maps[maps.size] = "mp_carentan_fix";
+		maps[maps.size] = "mp_chelm";
+		maps[maps.size] = "mp_breakout_tls";
+		maps[maps.size] = "mp_vallente";
+		maps[maps.size] = "wawa_3daim";
+*/
 
 		for(i = 0; i < maps.size; i++)
 		{
@@ -250,6 +289,7 @@ CheckInstallation()
 	blackList[blackList.size] = "zpam330";
 	blackList[blackList.size] = "zpam_maps_v1";
 	blackList[blackList.size] = "zpam331";
+	blackList[blackList.size] = "zpam332";
 
 	blackList[blackList.size] = "mp_chelm";
 	blackList[blackList.size] = "mp_breakout_tls";
diff --git a/source/maps/mp/gametypes/global/player.gsc b/source/maps/mp/gametypes/global/player.gsc
index 48a9b74..55a13d2 100644
--- a/source/maps/mp/gametypes/global/player.gsc
+++ b/source/maps/mp/gametypes/global/player.gsc
@@ -23,17 +23,28 @@ IsMoving()
 	self.isMoving = false;
 	self.isWaling = false;
 	self.movingDifference = 0;
+	self.movingVector = (0, 0, 0);
 
-	origin = self getOrigin();
+	origin = (0, 0, 0);
 	origin_old = origin;
+	firstFrame = true;
 
 	for (;;)
 	{
 		wait level.fps_multiplier * .1;
 
+		if (firstFrame)
+		{
+			firstFrame = false;
+			origin = self getOrigin();
+			origin_old = origin;
+		}
+
 		origin = self getOrigin();
 
 		self.movingDifference = distance(origin, origin_old);
+		self.movingVector = origin - origin_old;
+
 		if (self.movingDifference > 5.0)
 		{/*
 		  if (!self.isMoving)
@@ -79,7 +90,8 @@ AddTags()
 	self.pelvisTag = spawn("script_origin",(0,0,0));
 	//self.pelvisTag thread maps\mp\gametypes\global\developer::showWaypoint();
 
-	dead = true;
+	waitFrameBeforeLink = true;
+	isLinked = false;
 	for (;;)
 	{
 		wait level.frame;
@@ -87,32 +99,45 @@ AddTags()
 		// If player is not alive, or model is not set, wait
 		if (self.sessionstate != "playing" || !isDefined(self.pers["savedmodel"]))
 		{
-			dead = true;
+			if (isLinked)
+			{
+				self.headTag unlink();
+				self.pelvisTag unlink();
+				isLinked = false;
+			}
+			waitFrameBeforeLink = true;
 			continue;
 		}
 
-		// We can call linkto() after 1 frame or it will cause runtime error "failed to link entity since parent model 'xmodel/playerbody_german_africa01' is invalid"
-		if (dead)
+		if (!isLinked)
 		{
-			dead = false;
-			continue;
+			// We can call linkto() after 1 frame or it will cause runtime error "failed to link entity since parent model 'xmodel/playerbody_german_africa01' is invalid"
+			if (waitFrameBeforeLink)
+			{
+				waitFrameBeforeLink = false;
+				continue;
+			}
+			// Link tags
+			self.headTag linkto (self, "J_Head",(0,0,0),(0,0,0));
+			self.pelvisTag linkto (self, "pelvis",(0,0,0),(0,0,0));
+
+			isLinked = true;
 		}
-
-		// Link tags
-		self.headTag unlink();
-		self.headTag linkto (self, "J_Head",(0,0,0),(0,0,0));
-
-		self.pelvisTag unlink();
-		self.pelvisTag linkto (self, "pelvis",(0,0,0),(0,0,0));
 	}
 }
 
 DeleteTags()
 {
 	if (isDefined(self.headTag))
+	{
+		self.headTag unlink();
 		self.headTag delete();
+	}
 	if (isDefined(self.pelvisTag))
+	{
+		self.pelvisTag unlink();
 		self.pelvisTag delete();
+	}
 }
 
 
@@ -126,7 +151,7 @@ getEyeOrigin()
 {
 	origin = self getOrigin();
 
-	if (self.sessionteam == "spectator")
+	if (self.sessionstate == "spectator")
 	{
 		return origin + (0, 0, 8);
 	}
@@ -236,6 +261,62 @@ getStance()
 
 
 
+// Field of view based on current weapon
+getFOV()
+{
+	weapon_fov["m1carbine_mp"] = 55;
+	weapon_fov["m1garand_mp"] = 50;
+	weapon_fov["thompson_mp"] = 65;
+	weapon_fov["bar_mp"] = 50;
+	weapon_fov["springfield_mp"] = 15;
+	weapon_fov["greasegun_mp"] = 65;
+	weapon_fov["shotgun_mp"] = 65;
+	weapon_fov["enfield_mp"] = 50;
+	weapon_fov["sten_mp"] = 65;
+	weapon_fov["bren_mp"] = 50;
+	weapon_fov["enfield_scope_mp"] = 15;
+	weapon_fov["mosin_nagant_mp"] = 50;
+	weapon_fov["SVT40_mp"] = 50;
+	weapon_fov["PPS42_mp"] = 65;
+	weapon_fov["ppsh_mp"] = 65;
+	weapon_fov["mosin_nagant_sniper_mp"] = 15;
+	weapon_fov["kar98k_mp"] = 50;
+	weapon_fov["g43_mp"] = 50;
+	weapon_fov["mp40_mp"] = 65;
+	weapon_fov["mp44_mp"] = 50;
+	weapon_fov["kar98k_sniper_mp"] = 15;
+	weapon_fov["colt_mp"] = 80;
+	weapon_fov["luger_mp"] = 80;
+	weapon_fov["tt30_mp"] = 80;
+	weapon_fov["webley_mp"] = 80;
+	weapon_fov["mg_mp"] = 60;
+
+	fov = 80;
+
+	if (isAlive(self))
+	{
+		current = self getcurrentweapon(); // can be none
+		zoom = self playerAds();	// 1 = zoom | 0 = no zoom
+
+		if (self.usingMG)
+		{
+			current = "mg_mp";
+			zoom = 1;
+		}
+
+		if (zoom < 0.5)
+			zoom = 0;
+		else
+			zoom = (zoom*2)-1;
+
+		if (isDefined(weapon_fov[current]))
+			fov = 80 - (80 - weapon_fov[current]) * zoom;
+	}
+
+	return fov;
+}
+
+
 isPlayerLookingAt(entity)
 {
 	eye = self getEyeOrigin();
@@ -274,6 +355,19 @@ isPlayerInSight(player)
 }
 
 
+isEntityInSight(entity)
+{
+	eye = self getEyeOrigin();
+
+	trace = Bullettrace(eye, entity.origin, true, self); // BulletTrace( <start>, <end>, <hit characters>, <ignore entity> )
+	visible = isDefined(trace["entity"]) && trace["entity"] == entity;
+	if (visible)
+		return true;
+
+	return false;
+}
+
+
 getLookingAtPosition()
 {
 	eye = self getEyeOrigin();
diff --git a/source/maps/mp/gametypes/hq.gsc b/source/maps/mp/gametypes/hq.gsc
index 784e6ee..b8abf39 100644
--- a/source/maps/mp/gametypes/hq.gsc
+++ b/source/maps/mp/gametypes/hq.gsc
@@ -27,6 +27,7 @@ main()
 	level.allies = ::menuAllies;
 	level.axis = ::menuAxis;
 	level.spectator = ::menuSpectator;
+	level.streamer = ::menuStreamer;
 	level.weapon = ::menuWeapon;
 
 	level.spawnPlayer = ::spawnPlayer;
@@ -51,7 +52,6 @@ main()
 
 	registerCvar("scr_hq_radio_respawn_time", "INT", 15, 0, 300);
 	registerCvar("scr_hq_radio_hold_time", "INT", 120, 0, 300);
-	registerCvar("scr_hq_multiple_capture", "BOOL", 1);
 	registerCvar("scr_hq_restricted_smoke", "BOOL", 0);
 
 
@@ -86,7 +86,6 @@ onCvarChanged(cvar, value, isRegisterTime)
 		case "scr_hq_neutralizing_points": 	level.neutralizingpoints = value; return true;
 		case "scr_hq_radio_respawn_time": 	level.radiospawndelay = value; return true;
 		case "scr_hq_radio_hold_time": 		level.radiomaxholdseconds = value; return true;
-		case "scr_hq_multiple_capture": 	level.multiplecapturebias = value; return true;
 		case "scr_hq_restricted_smoke": 	level.restricted_smoke = value; return true;
 	}
 	return false;
@@ -129,8 +128,6 @@ precache()
 	precacheShader("field_radio");
 	precacheShader(game["radio_allies"]);
 	precacheShader(game["radio_axis"]);
-	precacheStatusIcon("hud_status_dead");
-	precacheStatusIcon("hud_status_connecting");
 	precacheRumble("damage_heavy");
 	precacheModel(game["radio_model"]);
 	precacheModel(game["radio_model_obj"]);
@@ -146,6 +143,7 @@ precache()
 	precacheString(&"MP_RESPAWN_WHEN_RADIO_NEUTRALIZED");
 	precacheString(&"MP_MATCHSTARTING");
 	precacheString(&"MP_MATCHRESUMING");
+	precacheStatusIcon("compassping_enemyfiring"); // for streamers
 
 	// HUD: Strattime
 	precacheString2("STRING_STRAT_TIME", &"Strat Time");
@@ -379,7 +377,10 @@ onConnected()
 	else
 	{
 		// If is team selected from last round, set the real team variable
-		self.sessionteam = self.pers["team"];
+		team = self.pers["team"];
+		if (team == "streamer")
+			team = "spectator";
+		self.sessionteam = team;
 	}
 
 	// Define default variables specific for this gametype
@@ -411,7 +412,7 @@ onAfterConnected()
 	}
 
 	// Spectator team
-	else if (self.pers["team"] == "spectator")
+	else if (self.pers["team"] == "spectator" || self.pers["team"] == "streamer")
 		spawnSpectator();
 
 	// If team is selected
@@ -751,6 +752,8 @@ spawnSpectator(origin, angles)
 
 	if(self.pers["team"] == "spectator")
 		self.statusicon = "";
+	else if(self.pers["team"] == "streamer")
+		self.statusicon = "compassping_enemyfiring"; // recording icon
 	else if (self.pers["team"] == "allies" || self.pers["team"] == "axis") // dead team spectartor
 		self.statusicon = "hud_status_dead";
 
@@ -780,10 +783,14 @@ spawnSpectator(origin, angles)
 
 
 	// If is real spectator (is in team spectator, not session state spectator)
-	if(self.pers["team"] == "spectator")
+	if (self.pers["team"] == "spectator")
 	{
 		self notify("spawned_spectator");
 	}
+	else if (self.pers["team"] == "streamer")
+	{
+		self notify("spawned_streamer");
+	}
 }
 
 
@@ -1112,7 +1119,7 @@ endMap()
 
 		player closeMenu();
 		player closeInGameMenu();
-		player setClientCvar("cg_objectiveText", text);
+		player setClientCvar2("cg_objectiveText", text);
 	}
 
 
@@ -1149,9 +1156,9 @@ hq_randomize_radioarray()
 	for(i = 0; i < level.radio.size; i++)
 	{
 		rand = randomint(level.radio.size);
-    	temp = level.radio[i];
-    	level.radio[i] = level.radio[rand];
-    	level.radio[rand] = temp;
+	    	temp = level.radio[i];
+	    	level.radio[i] = level.radio[rand];
+	    	level.radio[rand] = temp;
 	}
 }
 
@@ -1252,6 +1259,7 @@ hq_obj_think(radio)
 	}
 }
 
+// Is called for every radio script_model created on map
 hq_radio_think(radio)
 {
 	level endon("intermission");
@@ -1261,15 +1269,18 @@ hq_radio_think(radio)
 
 	while(!level.mapended)
 	{
-		wait level.fps_multiplier * 0.05;
+		wait level.frame;
 		if(!radio.hidden)
 		{
+			if (level.in_timeout || level.in_strattime)
+				continue;
+
 			players = getentarray("player", "classname");
 			radio.allies = 0;
 			radio.axis = 0;
 			for(i = 0; i < players.size; i++)
 			{
-				if(isdefined(players[i].pers["team"]) && players[i].pers["team"] != "spectator" && players[i].sessionstate == "playing")
+				if(isdefined(players[i].pers["team"]) && (players[i].pers["team"] == "allies" || players[i].pers["team"] == "axis") && players[i].sessionstate == "playing")
 				{
 					if(((distance(players[i].origin,radio.origin)) <= radio.radius) && (distance((0,0,players[i].origin[2]),(0,0,radio.origin[2])) <= level.zradioradius))
 					{
@@ -1279,15 +1290,6 @@ hq_radio_think(radio)
 						if((level.captured_radios[players[i].pers["team"]] > 0) && (radio.team == "none"))
 							continue;
 
-
-						while (level.in_timeout || level.in_strattime)
-							wait level.frame;
-
-						// Player disconnect in middle of timeout
-						if (!isDefined(players[i]))
-							continue;
-
-
 						if((!isdefined(players[i].radioicon)) || (!isdefined(players[i].radioicon[0])))
 						{
 							players[i].radioicon[0] = newClientHudElem(players[i]);
@@ -1511,14 +1513,22 @@ hq_radio_think(radio)
 				radio.collector_allies = 0;
 			if (radio.holdtime_axis == 0)
 				radio.collector_axis = 0;
-			multiplier = 1/level.fps_multiplier;
+
+			// On old pam it took 5.689sec to capture radio
+			// On 207 it took 9.449sec to capture radio
+
+			// Now if the thread will run every frame (instead of every 2 frames on 207), it will run every 33ms on sv_fps 30
+			// If we want to wait 10sec to capture, we need to increment (0.033 / 10) * 190 (width) = 0.627
+			holdtime = 10; // seconds
+			multiplier = ((level.frame / holdtime) * (level.progressBarWidth - 4)) / 2;
+
 
 			if(radio.team == "none") // Radio is captured if no enemies around
 			{
 				if((radio.allies > 0) && (radio.axis <= 0) && (radio.team != "allies"))
 				{
-					radio.collector_allies = (.667 + radio.collector_allies + (radio.allies * level.MultipleCaptureBias) * multiplier);
-					radio.holdtime_allies = int(radio.collector_allies);
+					radio.collector_allies = (multiplier + radio.collector_allies + (radio.allies * multiplier));
+					radio.holdtime_allies = 1 + int(radio.collector_allies);
 					//radio.holdtime_allies = int( .667 + (radio.holdtime_allies + (radio.allies * level.MultipleCaptureBias)));
 
 					if(radio.holdtime_allies >= (level.progressBarWidth - 4))
@@ -1531,8 +1541,8 @@ hq_radio_think(radio)
 				}
 				else if((radio.axis > 0) && (radio.allies <= 0) && (radio.team != "axis"))
 				{
-					radio.collector_axis = (.667 + radio.collector_axis + (radio.axis * level.MultipleCaptureBias) * multiplier);
-					radio.holdtime_axis = int(radio.collector_axis);
+					radio.collector_axis = (multiplier + radio.collector_axis + (radio.axis * multiplier));
+					radio.holdtime_axis = 1 + int(radio.collector_axis);
 					//radio.holdtime_axis = int( .667 + (radio.holdtime_axis + (radio.axis * level.MultipleCaptureBias)));
 
 					if(radio.holdtime_axis >= (level.progressBarWidth - 4))
@@ -1551,7 +1561,7 @@ hq_radio_think(radio)
 					players = getentarray("player", "classname");
 					for(i = 0; i < players.size; i++)
 					{
-						if(isdefined(players[i].pers["team"]) && players[i].pers["team"] != "spectator" && players[i].sessionstate == "playing")
+						if(isdefined(players[i].pers["team"]) && (players[i].pers["team"] == "allies" || players[i].pers["team"] == "axis") && players[i].sessionstate == "playing")
 						{
 							if(((distance(players[i].origin,radio.origin)) <= radio.radius) && (distance((0,0,players[i].origin[2]),(0,0,radio.origin[2])) <= level.zradioradius))
 							{
@@ -1593,27 +1603,18 @@ hq_radio_think(radio)
 					radio.collector_axis = 0;
 
 
-				// Timeout ended or defending team disconnects and there are no defending players -> kill radio
-				if (hq_check_radio_defenders_alive() == 0 && !level.in_timeout)
-				{
-					wait level.frame; // to get OnPlayerKilled called first if last player was killed
-
-					if (radio.team != "none")
-						level hq_radio_capture(radio, "none", true);
-				}
-
 				if((radio.allies > 0) && (radio.team == "axis"))
 				{
-					radio.collector_allies = (.667 + radio.collector_allies + (radio.allies * level.MultipleCaptureBias) * multiplier);
-					radio.holdtime_allies = int(radio.collector_allies);
+					radio.collector_allies = (multiplier + radio.collector_allies + (radio.allies * multiplier));
+					radio.holdtime_allies = 1 + int(radio.collector_allies);
 					//radio.holdtime_allies = int(.667 + (radio.holdtime_allies + (radio.allies * level.MultipleCaptureBias)));
 					if(radio.holdtime_allies >= (level.progressBarWidth - 4))
 						level hq_radio_capture(radio, "none");
 				}
 				else if((radio.axis > 0) && (radio.team == "allies"))
 				{
-					radio.collector_axis = (.667 + radio.collector_axis + (radio.axis * level.MultipleCaptureBias) * multiplier);
-					radio.holdtime_axis = int(radio.collector_axis);
+					radio.collector_axis = (multiplier + radio.collector_axis + (radio.axis * multiplier));
+					radio.holdtime_axis = 1 + int(radio.collector_axis);
 					//radio.holdtime_axis = int(.667 + (radio.holdtime_axis + (radio.axis * level.MultipleCaptureBias)));
 					if(radio.holdtime_axis >= (level.progressBarWidth - 4))
 						level hq_radio_capture(radio, "none");
@@ -1628,7 +1629,7 @@ hq_radio_think(radio)
 	}
 }
 
-hq_radio_capture(radio, team, teamdead)
+hq_radio_capture(radio, team)
 {
 	radio.holdtime_allies = 0;
 	radio.holdtime_axis = 0;
@@ -1638,7 +1639,7 @@ hq_radio_capture(radio, team, teamdead)
 	{
 		players[i].WaitingOnTimer = undefined;
 		players[i].WaitingOnNeutralize = undefined;
-		if(isdefined(players[i].pers["team"]) && players[i].pers["team"] != "spectator" && players[i].sessionstate == "playing")
+		if(isdefined(players[i].pers["team"]) && (players[i].pers["team"] == "allies" || players[i].pers["team"] == "axis") && players[i].sessionstate == "playing")
 		{
 			if((isdefined(players[i].radioicon)) && (isdefined(players[i].radioicon[0])))
 			{
@@ -1661,10 +1662,7 @@ hq_radio_capture(radio, team, teamdead)
 		// Print some text
 		if(radio.team == "allies")
 		{
-			if(!isDefined(teamdead))
-				iprintln(&"MP_SHUTDOWN_ALLIED_HQ");
-			else
-				iprintln("Allied HQ has been shut down");
+			iprintln(&"MP_SHUTDOWN_ALLIED_HQ");
 
 			if(isdefined(level.progressbar_axis_neutralize))
 				level.progressbar_axis_neutralize destroy();
@@ -1675,10 +1673,7 @@ hq_radio_capture(radio, team, teamdead)
 		}
 		else if(radio.team == "axis")
 		{
-			if(!isDefined(teamdead))
-				iprintln(&"MP_SHUTDOWN_AXIS_HQ");
-			else
-				iprintln("Axis HQ has been shut down");
+			iprintln(&"MP_SHUTDOWN_AXIS_HQ");
 
 			if(isdefined(level.progressbar_allies_neutralize))
 				level.progressbar_allies_neutralize destroy();
@@ -1851,6 +1846,7 @@ hq_radio_capture(radio, team, teamdead)
 	level thread hq_obj_think(radio);
 }
 
+
 hq_maxholdtime_think()
 {
 	level endon("Radio State Changed");
@@ -1911,7 +1907,7 @@ hq_radio_resetall()
 	{
 		players[i].WaitingOnTimer = undefined;
 		players[i].WaitingOnNeutralize = undefined;
-		if(isdefined(players[i].pers["team"]) && players[i].pers["team"] != "spectator" && players[i].sessionstate == "playing")
+		if(isdefined(players[i].pers["team"]) && (players[i].pers["team"] == "allies" || players[i].pers["team"] == "axis") && players[i].sessionstate == "playing")
 		{
 			if((isdefined(players[i].radioicon)) && (isdefined(players[i].radioicon[0])))
 			{
@@ -2073,7 +2069,7 @@ updateTeamStatus()
 	players = getentarray("player", "classname");
 	for(i = 0; i < players.size; i++)
 	{
-		if(isdefined(players[i].pers["team"]) && players[i].pers["team"] != "spectator" && players[i].sessionstate == "playing")
+		if(isdefined(players[i].pers["team"]) && (players[i].pers["team"] == "allies" || players[i].pers["team"] == "axis") && players[i].sessionstate == "playing")
 			level.exist[players[i].pers["team"]]++;
 	}
 }
@@ -2103,7 +2099,7 @@ menuAutoAssign()
 	{
 		player = players[i];
 
-		if(player.pers["team"] == "spectator" || player.pers["team"] == "none")
+		if(player.pers["team"] != "allies" && player.pers["team"] != "axis")
 			continue;
 
 		numonteam[player.pers["team"]]++;
@@ -2233,6 +2229,34 @@ menuSpectator()
 	level notify("joined", "spectator", self); // used in first round to check if someone joined team
 }
 
+menuStreamer()
+{
+	if(self.pers["team"] == "streamer")
+		return;
+
+	self.joining_team = "streamer";
+	self.leaving_team = self.pers["team"];
+
+	if(isAlive(self))
+	{
+		self.switching_teams = true;
+		self suicide();
+	}
+
+	self.sessionteam = "spectator";
+	self.statusicon = "";
+	self.pers["team"] = "streamer";
+	self.pers["weapon"] = undefined;
+	self.pers["savedmodel"] = undefined;
+
+	spawnSpectator();
+
+	self notify("joined", "streamer");
+	self notify("joined_streamers");
+
+	level notify("joined", "streamer", self); // used in first round to check if someone joined team
+}
+
 menuWeapon(response)
 {
 	// You has to be "allies" or "axis" to change a weapon
diff --git a/source/maps/mp/gametypes/htf.gsc b/source/maps/mp/gametypes/htf.gsc
index dec08de..bfbf941 100644
--- a/source/maps/mp/gametypes/htf.gsc
+++ b/source/maps/mp/gametypes/htf.gsc
@@ -27,6 +27,7 @@ main()
 	level.allies = ::menuAllies;
 	level.axis = ::menuAxis;
 	level.spectator = ::menuSpectator;
+	level.streamer = ::menuStreamer;
 	level.weapon = ::menuWeapon;
 
 	level.spawnPlayer = ::spawnPlayer;
@@ -92,10 +93,9 @@ onCvarChanged(cvar, value, isRegisterTime)
 // Is called only once per map
 precache()
 {
-	precacheStatusIcon("hud_status_dead");
-	precacheStatusIcon("hud_status_connecting");
 	precacheStatusIcon(level.hudflag_allies);
 	precacheStatusIcon(level.hudflag_axis);
+	precacheStatusIcon("compassping_enemyfiring"); // for streamers
 	precacheShader(level.compassflag_allies);
 	precacheShader(level.compassflag_axis);
 	precacheShader(level.compassflag_none);
@@ -321,7 +321,10 @@ onConnected()
 	else
 	{
 		// If is team selected from last round, set the real team variable
-		self.sessionteam = self.pers["team"];
+		team = self.pers["team"];
+		if (team == "streamer")
+			team = "spectator";
+		self.sessionteam = team;
 	}
 
 	// Define default variables specific for this gametype
@@ -357,7 +360,7 @@ onAfterConnected()
 	}
 
 	// Spectator team
-	else if (self.pers["team"] == "spectator")
+	else if (self.pers["team"] == "spectator" || self.pers["team"] == "streamer")
 		spawnSpectator();
 
 	// If team is selected
@@ -734,6 +737,8 @@ spawnSpectator(origin, angles)
 
 	if(self.pers["team"] == "spectator")
 		self.statusicon = "";
+	else if(self.pers["team"] == "streamer")
+		self.statusicon = "compassping_enemyfiring"; // recording icon
 	else if (self.pers["team"] == "allies" || self.pers["team"] == "axis") // dead team spectartor
 		self.statusicon = "hud_status_dead";
 
@@ -759,10 +764,14 @@ spawnSpectator(origin, angles)
 	self notify("spawned");
 
 	// If is real spectator (is in team spectator, not session state spectator)
-	if(self.pers["team"] == "spectator")
+	if (self.pers["team"] == "spectator")
 	{
 		self notify("spawned_spectator");
 	}
+	else if (self.pers["team"] == "streamer")
+	{
+		self notify("spawned_streamer");
+	}
 }
 
 spawnIntermission()
@@ -1125,7 +1134,7 @@ endMap()
 
 		player closeMenu();
 		player closeInGameMenu();
-		player setClientCvar("cg_objectiveText", text);
+		player setClientCvar2("cg_objectiveText", text);
 	}
 
 
@@ -1588,7 +1597,7 @@ menuAutoAssign()
 	{
 		player = players[i];
 
-		if(player.pers["team"] == "spectator" || player.pers["team"] == "none")
+		if(player.pers["team"] != "allies" && player.pers["team"] != "axis")
 			continue;
 
 		numonteam[player.pers["team"]]++;
@@ -1717,6 +1726,34 @@ menuSpectator()
 	level notify("joined", "spectator", self); // used in first round to check if someone joined team
 }
 
+menuStreamer()
+{
+	if(self.pers["team"] == "streamer")
+		return;
+
+	self.joining_team = "streamer";
+	self.leaving_team = self.pers["team"];
+
+	if(isAlive(self))
+	{
+		self.switching_teams = true;
+		self suicide();
+	}
+
+	self.sessionteam = "spectator";
+	self.statusicon = "";
+	self.pers["team"] = "streamer";
+	self.pers["weapon"] = undefined;
+	self.pers["savedmodel"] = undefined;
+
+	spawnSpectator();
+
+	self notify("joined", "streamer");
+	self notify("joined_streamers");
+
+	level notify("joined", "streamer", self); // used in first round to check if someone joined team
+}
+
 menuWeapon(response)
 {
 	// You has to be "allies" or "axis" to change a weapon
diff --git a/source/maps/mp/gametypes/re.gsc b/source/maps/mp/gametypes/re.gsc
index 2b8641e..fc966fc 100644
--- a/source/maps/mp/gametypes/re.gsc
+++ b/source/maps/mp/gametypes/re.gsc
@@ -28,6 +28,7 @@ main()
 	level.allies = ::menuAllies;
 	level.axis = ::menuAxis;
 	level.spectator = ::menuSpectator;
+	level.streamer = ::menuStreamer;
 	level.weapon = ::menuWeapon;
 
 	level.spawnPlayer = ::spawnPlayer;
@@ -110,6 +111,7 @@ precache()
 	precacheShader("hint_use_touch");
 	precacheHeadIcon(game["headicon_carrier"]);
 	precacheStatusIcon(game["headicon_carrier"]);
+	precacheStatusIcon("compassping_enemyfiring"); // for streamers
 	precacheString(&"RE_CARRYINGGENERIC");
 	precacheString(&"RE_PICKUPAXISONLYGENERIC");
 	precacheString(&"RE_PICKUPALLIESONLYGENERIC");
@@ -525,10 +527,6 @@ onStartGameType()
 		game["allies_score"] = 0;
 		game["axis_score"] = 0;
 
-		// For spectators
-		game["allies_score_history"] = "";
-		game["axis_score_history"] = "";
-
 		// Half-separed scoresg
 		game["half_1_allies_score"] = 0;
 		game["half_1_axis_score"] = 0;
@@ -802,7 +800,10 @@ onConnected()
 	else
 	{
 		// If is team selected from last round, set the real team variable
-		self.sessionteam = self.pers["team"];
+		team = self.pers["team"];
+		if (team == "streamer")
+			team = "spectator";
+		self.sessionteam = team;
 	}
 
 
@@ -819,7 +820,7 @@ onConnected()
 		self.pers["deaths"] = 0;
 	self.deaths = self.pers["deaths"];
 
-	self setClientCvar("cg_objectiveText", "");
+	self setClientCvar2("cg_objectiveText", "");
 }
 
 // This function is called as last after all events are processed
@@ -839,7 +840,7 @@ onAfterConnected()
 	}
 
 	// Spectator team
-	else if (self.pers["team"] == "spectator")
+	else if (self.pers["team"] == "spectator" || self.pers["team"] == "streamer")
 		spawnSpectator();
 
 	// If team is selected
@@ -1356,10 +1357,10 @@ spawnPlayer()
 	if(!level.in_readyup && !level.in_timeout)
 	{
 		if(self.pers["team"] == game["attackers"])
-			self setClientCvar("cg_objectiveText", &"RE_ATTACKER");
+			self setClientCvar2("cg_objectiveText", &"RE_ATTACKER");
 
 		else if(self.pers["team"] == game["defenders"])
-			self setClientCvar("cg_objectiveText", &"RE_DEFENDER");
+			self setClientCvar2("cg_objectiveText", &"RE_DEFENDER");
 	}
 
 
@@ -1442,6 +1443,8 @@ spawnSpectator(origin, angles)
 
 	if(self.pers["team"] == "spectator")
 		self.statusicon = "";
+	else if(self.pers["team"] == "streamer")
+		self.statusicon = "compassping_enemyfiring"; // recording icon
 	else if (self.pers["team"] == "allies" || self.pers["team"] == "axis") // dead team spectartor
 		self.statusicon = "hud_status_dead";
 
@@ -1471,14 +1474,18 @@ spawnSpectator(origin, angles)
 	// Notify "spawned" notifications
 	self notify("spawned");
 
-	self setClientCvar("cg_objectiveText", "");
+	self setClientCvar2("cg_objectiveText", "");
 
 
 	// If is real spectator (is in team spectator, not session state spectator)
-	if(self.pers["team"] == "spectator")
+	if (self.pers["team"] == "spectator")
 	{
 		self notify("spawned_spectator");
 	}
+	else if (self.pers["team"] == "streamer")
+	{
+		self notify("spawned_streamer");
+	}
 }
 
 spawnIntermission()
@@ -1614,7 +1621,7 @@ startRound()
 	{
 		player = players[i];
 
-		if (player.pers["team"] == "none" || player.pers["team"] == "spectator")
+		if(player.pers["team"] != "allies" && player.pers["team"] != "axis")
 			continue;
 
 		// Players on a team but without a weapon or dead show as dead since they can not get in this round
@@ -1960,21 +1967,7 @@ endRound(roundwinner)
 	setTeamScore("axis", game["axis_score"]);
 
 	// History score for spectators
-	if(roundwinner == "allies")
-	{
-		game["allies_score_history"] += "^2#";
-		game["axis_score_history"] += "^1=";
-	}
-	else if(roundwinner == "axis")
-	{
-		game["allies_score_history"] += "^1=";
-		game["axis_score_history"] += "^2#";
-	}
-	else // draw
-	{
-		game["allies_score_history"] += "^7-";
-		game["axis_score_history"] += "^7-";
-	}
+	level maps\mp\gametypes\_spectating_system_hud::ScoreProgress_AddWinner(roundwinner);
 
 
 	// Update score
@@ -3200,7 +3193,7 @@ menuAutoAssign()
 	{
 		player = players[i];
 
-		if(player.pers["team"] == "spectator" || player.pers["team"] == "none")
+		if(player.pers["team"] != "allies" && player.pers["team"] != "axis")
 			continue;
 
 		numonteam[player.pers["team"]]++;
@@ -3347,6 +3340,37 @@ menuSpectator()
 	level notify("joined", "spectator", self); // used in first round to check if someone joined team
 }
 
+menuStreamer()
+{
+	if(self.pers["team"] == "streamer")
+		return;
+
+	self.joining_team = "streamer";
+	self.leaving_team = self.pers["team"];
+
+	if(isAlive(self))
+	{
+		self.switching_teams = true;
+		self suicide();
+	}
+
+	self.sessionteam = "spectator";
+	self.statusicon = "";
+	self.pers["team"] = "streamer";
+	self.pers["weapon"] = undefined;
+	self.pers["weapon1"] = undefined;
+	self.pers["weapon2"] = undefined;
+	self.pers["savedmodel"] = undefined;
+
+
+	spawnSpectator();
+
+	self notify("joined", "streamer");
+	self notify("joined_streamers");
+
+	level notify("joined", "streamer", self); // used in first round to check if someone joined team
+}
+
 menuWeapon(response)
 {
 	// You has to be "allies" or "axis" to change a weapon
diff --git a/source/maps/mp/gametypes/rules/ctf/comp.gsc b/source/maps/mp/gametypes/rules/ctf/comp.gsc
index af54fa3..1cb03eb 100644
--- a/source/maps/mp/gametypes/rules/ctf/comp.gsc
+++ b/source/maps/mp/gametypes/rules/ctf/comp.gsc
@@ -76,6 +76,7 @@ GetCvars(arr)
 	arr = ruleCvarDefault(arr, "scr_teambalance", 0);
 	arr = ruleCvarDefault(arr, "scr_spectatefree", 0);
 	arr = ruleCvarDefault(arr, "scr_spectateenemy", 0);
+	arr = ruleCvarDefault(arr, "scr_spectatingsystem", 1);				// Enable spectating system (menu overlay with auto-killcam, auto-spectator, xray, etc.. features)
 
 	arr = ruleCvarDefault(arr, "g_allowVote", 0);
 	arr = ruleCvarDefault(arr, "g_maxDroppedWeapons", 10);
diff --git a/source/maps/mp/gametypes/rules/developer.gsc b/source/maps/mp/gametypes/rules/developer.gsc
index 278d896..a168ee8 100644
--- a/source/maps/mp/gametypes/rules/developer.gsc
+++ b/source/maps/mp/gametypes/rules/developer.gsc
@@ -38,7 +38,6 @@ GetCvars(arr)
 	arr = ruleCvarDefault(arr, "scr_hq_neutralizing_points", 10);
 	arr = ruleCvarDefault(arr, "scr_hq_radio_respawn_time", 3);
 	arr = ruleCvarDefault(arr, "scr_hq_radio_hold_time", 120);
-	arr = ruleCvarDefault(arr, "scr_hq_multiple_capture", 1);
 
 
 
diff --git a/source/maps/mp/gametypes/rules/dm/comp.gsc b/source/maps/mp/gametypes/rules/dm/comp.gsc
index 155155e..c0db647 100644
--- a/source/maps/mp/gametypes/rules/dm/comp.gsc
+++ b/source/maps/mp/gametypes/rules/dm/comp.gsc
@@ -71,6 +71,7 @@ GetCvars(arr)
 	arr = ruleCvarDefault(arr, "scr_teambalance", 0);
 	arr = ruleCvarDefault(arr, "scr_spectatefree", 0);
 	arr = ruleCvarDefault(arr, "scr_spectateenemy", 0);
+	arr = ruleCvarDefault(arr, "scr_spectatingsystem", 1);				// Enable spectating system (menu overlay with auto-killcam, auto-spectator, xray, etc.. features)
 
 	arr = ruleCvarDefault(arr, "g_allowVote", 0);
 	arr = ruleCvarDefault(arr, "g_maxDroppedWeapons", 10);
diff --git a/source/maps/mp/gametypes/rules/dm/warmup.gsc b/source/maps/mp/gametypes/rules/dm/warmup.gsc
index 700b3c0..53c972e 100644
--- a/source/maps/mp/gametypes/rules/dm/warmup.gsc
+++ b/source/maps/mp/gametypes/rules/dm/warmup.gsc
@@ -72,6 +72,7 @@ GetCvars(arr)
 	arr = ruleCvarDefault(arr, "scr_teambalance", 0);
 	arr = ruleCvarDefault(arr, "scr_spectatefree", 0);
 	arr = ruleCvarDefault(arr, "scr_spectateenemy", 0);
+	arr = ruleCvarDefault(arr, "scr_spectatingsystem", 1);				// Enable spectating system (menu overlay with auto-killcam, auto-spectator, xray, etc.. features)
 
 	// Not Likely to Change
 	arr = ruleCvarDefault(arr, "g_allowVote", 0);
diff --git a/source/maps/mp/gametypes/rules/hq/comp.gsc b/source/maps/mp/gametypes/rules/hq/comp.gsc
index fa1a44b..6042966 100644
--- a/source/maps/mp/gametypes/rules/hq/comp.gsc
+++ b/source/maps/mp/gametypes/rules/hq/comp.gsc
@@ -22,7 +22,6 @@ GetCvars(arr)
 	arr = ruleCvarDefault(arr, "scr_hq_neutralizing_points", 10);
 	arr = ruleCvarDefault(arr, "scr_hq_radio_respawn_time", 15);
 	arr = ruleCvarDefault(arr, "scr_hq_radio_hold_time", 120);
-	arr = ruleCvarDefault(arr, "scr_hq_multiple_capture", 1);
 	arr = ruleCvarDefault(arr, "scr_hq_restricted_smoke", 0);		// Get smoke only if radio is take by some team
 
 
@@ -83,6 +82,7 @@ GetCvars(arr)
 	arr = ruleCvarDefault(arr, "scr_teambalance", 0);
 	arr = ruleCvarDefault(arr, "scr_spectatefree", 0);
 	arr = ruleCvarDefault(arr, "scr_spectateenemy", 0);
+	arr = ruleCvarDefault(arr, "scr_spectatingsystem", 1);				// Enable spectating system (menu overlay with auto-killcam, auto-spectator, xray, etc.. features)
 
 	arr = ruleCvarDefault(arr, "g_allowVote", 0);
 	arr = ruleCvarDefault(arr, "g_maxDroppedWeapons", 10);
diff --git a/source/maps/mp/gametypes/rules/htf/comp.gsc b/source/maps/mp/gametypes/rules/htf/comp.gsc
index 7ce8eea..ee6197d 100644
--- a/source/maps/mp/gametypes/rules/htf/comp.gsc
+++ b/source/maps/mp/gametypes/rules/htf/comp.gsc
@@ -81,6 +81,7 @@ GetCvars(arr)
 	arr = ruleCvarDefault(arr, "scr_teambalance", 0);
 	arr = ruleCvarDefault(arr, "scr_spectatefree", 0);
 	arr = ruleCvarDefault(arr, "scr_spectateenemy", 0);
+	arr = ruleCvarDefault(arr, "scr_spectatingsystem", 1);				// Enable spectating system (menu overlay with auto-killcam, auto-spectator, xray, etc.. features)
 
 	arr = ruleCvarDefault(arr, "g_allowVote", 0);
 	arr = ruleCvarDefault(arr, "g_maxDroppedWeapons", 10);
diff --git a/source/maps/mp/gametypes/rules/re/comp.gsc b/source/maps/mp/gametypes/rules/re/comp.gsc
index 2693abd..10fca0a 100644
--- a/source/maps/mp/gametypes/rules/re/comp.gsc
+++ b/source/maps/mp/gametypes/rules/re/comp.gsc
@@ -56,7 +56,7 @@ GetCvars(arr)
 		arr = ruleCvarDefault(arr, "scr_re_half_round", 3);
 		arr = ruleCvarDefault(arr, "scr_re_half_score", 0);
 		arr = ruleCvarDefault(arr, "scr_re_end_round", 6);
-		arr = ruleCvarDefault(arr, "scr_re_end_score", 4);
+		arr = ruleCvarDefault(arr, "scr_re_end_score", game["overtime_score"] + 4); // 12 / 12  ->  16 / 16  ->  20 / 20  -> ...
 
 		// Half auto-resume time
 		arr = ruleCvarDefault(arr, "scr_readyup_autoresume_half", 1); 	// Minutes to auto-resume halftime [0 - 10] 0 = disabled
@@ -104,6 +104,9 @@ GetCvars(arr)
 	arr = ruleCvarDefault(arr, "scr_teambalance", 0);
 	arr = ruleCvarDefault(arr, "scr_spectatefree", 0);
 	arr = ruleCvarDefault(arr, "scr_spectateenemy", 0);
+	arr = ruleCvarDefault(arr, "scr_spectatingsystem", 1);				// Enable spectating system (menu overlay with auto-killcam, auto-spectator, xray, etc.. features)
+
+
 
 	arr = ruleCvarDefault(arr, "g_allowVote", 0);
 	arr = ruleCvarDefault(arr, "g_maxDroppedWeapons", 32);
diff --git a/source/maps/mp/gametypes/rules/re/score/mr10.gsc b/source/maps/mp/gametypes/rules/re/score/mr10.gsc
index 6a7d55d..460407f 100644
--- a/source/maps/mp/gametypes/rules/re/score/mr10.gsc
+++ b/source/maps/mp/gametypes/rules/re/score/mr10.gsc
@@ -24,7 +24,7 @@ GetCvars(arr)
 		arr = ruleCvarDefault(arr, "scr_re_half_round", 3);
 		arr = ruleCvarDefault(arr, "scr_re_half_score", 0);
 		arr = ruleCvarDefault(arr, "scr_re_end_round", 6);
-		arr = ruleCvarDefault(arr, "scr_re_end_score", 4);
+		arr = ruleCvarDefault(arr, "scr_re_end_score", game["overtime_score"] + 4); // 12 / 12  ->  16 / 16  ->  20 / 20  -> ...
 	}
 
 	arr = ruleCvarDefault(arr, "scr_show_scoreboard_limit", 1);	// show limit in score with slash
diff --git a/source/maps/mp/gametypes/rules/re/score/mr12.gsc b/source/maps/mp/gametypes/rules/re/score/mr12.gsc
index ad083c9..266eb6e 100644
--- a/source/maps/mp/gametypes/rules/re/score/mr12.gsc
+++ b/source/maps/mp/gametypes/rules/re/score/mr12.gsc
@@ -24,7 +24,7 @@ GetCvars(arr)
 		arr = ruleCvarDefault(arr, "scr_re_half_round", 3);
 		arr = ruleCvarDefault(arr, "scr_re_half_score", 0);
 		arr = ruleCvarDefault(arr, "scr_re_end_round", 6);
-		arr = ruleCvarDefault(arr, "scr_re_end_score", 4);
+		arr = ruleCvarDefault(arr, "scr_re_end_score", game["overtime_score"] + 4); // 12 / 12  ->  16 / 16  ->  20 / 20  -> ...
 	}
 
 	arr = ruleCvarDefault(arr, "scr_show_scoreboard_limit", 1);	// show limit in score with slash
diff --git a/source/maps/mp/gametypes/rules/re/score/mr15.gsc b/source/maps/mp/gametypes/rules/re/score/mr15.gsc
index bf2a461..2302af6 100644
--- a/source/maps/mp/gametypes/rules/re/score/mr15.gsc
+++ b/source/maps/mp/gametypes/rules/re/score/mr15.gsc
@@ -24,7 +24,7 @@ GetCvars(arr)
 		arr = ruleCvarDefault(arr, "scr_re_half_round", 3);
 		arr = ruleCvarDefault(arr, "scr_re_half_score", 0);
 		arr = ruleCvarDefault(arr, "scr_re_end_round", 6);
-		arr = ruleCvarDefault(arr, "scr_re_end_score", 4);
+		arr = ruleCvarDefault(arr, "scr_re_end_score", game["overtime_score"] + 4); // 12 / 12  ->  16 / 16  ->  20 / 20  -> ...
 	}
 
 	arr = ruleCvarDefault(arr, "scr_show_scoreboard_limit", 1);	// show limit in score with slash
diff --git a/source/maps/mp/gametypes/rules/re/score/mr3.gsc b/source/maps/mp/gametypes/rules/re/score/mr3.gsc
index af20b44..e41f014 100644
--- a/source/maps/mp/gametypes/rules/re/score/mr3.gsc
+++ b/source/maps/mp/gametypes/rules/re/score/mr3.gsc
@@ -24,7 +24,7 @@ GetCvars(arr)
 		arr = ruleCvarDefault(arr, "scr_re_half_round", 3);
 		arr = ruleCvarDefault(arr, "scr_re_half_score", 0);
 		arr = ruleCvarDefault(arr, "scr_re_end_round", 6);
-		arr = ruleCvarDefault(arr, "scr_re_end_score", 4);
+		arr = ruleCvarDefault(arr, "scr_re_end_score", game["overtime_score"] + 4); // 12 / 12  ->  16 / 16  ->  20 / 20  -> ...
 	}
 
 	arr = ruleCvarDefault(arr, "scr_show_scoreboard_limit", 1);	// show limit in score with slash
diff --git a/source/maps/mp/gametypes/rules/sd/comp.gsc b/source/maps/mp/gametypes/rules/sd/comp.gsc
index 87dc10a..2db1949 100644
--- a/source/maps/mp/gametypes/rules/sd/comp.gsc
+++ b/source/maps/mp/gametypes/rules/sd/comp.gsc
@@ -62,7 +62,7 @@ GetCvars(arr)
 		arr = ruleCvarDefault(arr, "scr_sd_half_round", 3);
 		arr = ruleCvarDefault(arr, "scr_sd_half_score", 0);
 		arr = ruleCvarDefault(arr, "scr_sd_end_round", 6);
-		arr = ruleCvarDefault(arr, "scr_sd_end_score", 4);
+		arr = ruleCvarDefault(arr, "scr_sd_end_score", game["overtime_score"] + 4); // 12 / 12  ->  16 / 16  ->  20 / 20  -> ...
 
 		// Half auto-resume time
 		arr = ruleCvarDefault(arr, "scr_readyup_autoresume_half", 1); 	// Minutes to auto-resume halftime [0 - 10] 0 = disabled
@@ -110,6 +110,7 @@ GetCvars(arr)
 	arr = ruleCvarDefault(arr, "scr_teambalance", 0);
 	arr = ruleCvarDefault(arr, "scr_spectatefree", 0);
 	arr = ruleCvarDefault(arr, "scr_spectateenemy", 0);
+	arr = ruleCvarDefault(arr, "scr_spectatingsystem", 1);				// Enable spectating system (menu overlay with auto-killcam, auto-spectator, xray, etc.. features)
 
 	arr = ruleCvarDefault(arr, "g_allowVote", 0);
 	arr = ruleCvarDefault(arr, "g_maxDroppedWeapons", 32);
diff --git a/source/maps/mp/gametypes/rules/sd/score/mr10.gsc b/source/maps/mp/gametypes/rules/sd/score/mr10.gsc
index 7eb78fa..3166b52 100644
--- a/source/maps/mp/gametypes/rules/sd/score/mr10.gsc
+++ b/source/maps/mp/gametypes/rules/sd/score/mr10.gsc
@@ -24,7 +24,7 @@ GetCvars(arr)
 		arr = ruleCvarDefault(arr, "scr_sd_half_round", 3);
 		arr = ruleCvarDefault(arr, "scr_sd_half_score", 0);
 		arr = ruleCvarDefault(arr, "scr_sd_end_round", 6);
-		arr = ruleCvarDefault(arr, "scr_sd_end_score", 4);
+		arr = ruleCvarDefault(arr, "scr_sd_end_score", game["overtime_score"] + 4); // 12 / 12  ->  16 / 16  ->  20 / 20  -> ...
 	}
 
 	arr = ruleCvarDefault(arr, "scr_show_scoreboard_limit", 1);	// show limit in score with slash
diff --git a/source/maps/mp/gametypes/rules/sd/score/mr12.gsc b/source/maps/mp/gametypes/rules/sd/score/mr12.gsc
index 80a7443..ff89ac0 100644
--- a/source/maps/mp/gametypes/rules/sd/score/mr12.gsc
+++ b/source/maps/mp/gametypes/rules/sd/score/mr12.gsc
@@ -24,7 +24,7 @@ GetCvars(arr)
 		arr = ruleCvarDefault(arr, "scr_sd_half_round", 3);
 		arr = ruleCvarDefault(arr, "scr_sd_half_score", 0);
 		arr = ruleCvarDefault(arr, "scr_sd_end_round", 6);
-		arr = ruleCvarDefault(arr, "scr_sd_end_score", 4);
+		arr = ruleCvarDefault(arr, "scr_sd_end_score", game["overtime_score"] + 4); // 12 / 12  ->  16 / 16  ->  20 / 20  -> ...
 	}
 
 	arr = ruleCvarDefault(arr, "scr_show_scoreboard_limit", 1);	// show limit in score with slash
diff --git a/source/maps/mp/gametypes/rules/sd/score/mr15.gsc b/source/maps/mp/gametypes/rules/sd/score/mr15.gsc
index 8e95ac8..7eeada0 100644
--- a/source/maps/mp/gametypes/rules/sd/score/mr15.gsc
+++ b/source/maps/mp/gametypes/rules/sd/score/mr15.gsc
@@ -24,7 +24,7 @@ GetCvars(arr)
 		arr = ruleCvarDefault(arr, "scr_sd_half_round", 3);
 		arr = ruleCvarDefault(arr, "scr_sd_half_score", 0);
 		arr = ruleCvarDefault(arr, "scr_sd_end_round", 6);
-		arr = ruleCvarDefault(arr, "scr_sd_end_score", 4);
+		arr = ruleCvarDefault(arr, "scr_sd_end_score", game["overtime_score"] + 4); // 12 / 12  ->  16 / 16  ->  20 / 20  -> ...
 	}
 
 	arr = ruleCvarDefault(arr, "scr_show_scoreboard_limit", 1);	// show limit in score with slash
diff --git a/source/maps/mp/gametypes/rules/sd/score/mr3.gsc b/source/maps/mp/gametypes/rules/sd/score/mr3.gsc
index b00f884..da227e7 100644
--- a/source/maps/mp/gametypes/rules/sd/score/mr3.gsc
+++ b/source/maps/mp/gametypes/rules/sd/score/mr3.gsc
@@ -24,7 +24,7 @@ GetCvars(arr)
 		arr = ruleCvarDefault(arr, "scr_sd_half_round", 3);
 		arr = ruleCvarDefault(arr, "scr_sd_half_score", 0);
 		arr = ruleCvarDefault(arr, "scr_sd_end_round", 6);
-		arr = ruleCvarDefault(arr, "scr_sd_end_score", 4);
+		arr = ruleCvarDefault(arr, "scr_sd_end_score", game["overtime_score"] + 4); // 12 / 12  ->  16 / 16  ->  20 / 20  -> ...
 	}
 
 	arr = ruleCvarDefault(arr, "scr_show_scoreboard_limit", 1);	// show limit in score with slash
diff --git a/source/maps/mp/gametypes/rules/strat/strat.gsc b/source/maps/mp/gametypes/rules/strat/strat.gsc
index f507a13..d57355f 100644
--- a/source/maps/mp/gametypes/rules/strat/strat.gsc
+++ b/source/maps/mp/gametypes/rules/strat/strat.gsc
@@ -51,6 +51,7 @@ GetCvars(arr)
 	arr = ruleCvarDefault(arr, "scr_teambalance", 0);
 	arr = ruleCvarDefault(arr, "scr_spectatefree", 1);
 	arr = ruleCvarDefault(arr, "scr_spectateenemy", 1);
+	arr = ruleCvarDefault(arr, "scr_spectatingsystem", 0);				// Enable spectating system (menu overlay with auto-killcam, auto-spectator, xray, etc.. features)
 
 	arr = ruleCvarDefault(arr, "g_allowVote", 0);
 	arr = ruleCvarDefault(arr, "g_maxDroppedWeapons", 32);
diff --git a/source/maps/mp/gametypes/rules/tdm/comp.gsc b/source/maps/mp/gametypes/rules/tdm/comp.gsc
index 627c5cf..bb79498 100644
--- a/source/maps/mp/gametypes/rules/tdm/comp.gsc
+++ b/source/maps/mp/gametypes/rules/tdm/comp.gsc
@@ -71,6 +71,7 @@ GetCvars(arr)
 	arr = ruleCvarDefault(arr, "scr_teambalance", 0);
 	arr = ruleCvarDefault(arr, "scr_spectatefree", 0);
 	arr = ruleCvarDefault(arr, "scr_spectateenemy", 0);
+	arr = ruleCvarDefault(arr, "scr_spectatingsystem", 1);				// Enable spectating system (menu overlay with auto-killcam, auto-spectator, xray, etc.. features)
 
 	arr = ruleCvarDefault(arr, "g_allowVote", 0);
 	arr = ruleCvarDefault(arr, "g_maxDroppedWeapons", 10);
diff --git a/source/maps/mp/gametypes/sd.gsc b/source/maps/mp/gametypes/sd.gsc
index d1bcabd..8096dd2 100644
--- a/source/maps/mp/gametypes/sd.gsc
+++ b/source/maps/mp/gametypes/sd.gsc
@@ -109,6 +109,7 @@ main()
 	level.allies = ::menuAllies;
 	level.axis = ::menuAxis;
 	level.spectator = ::menuSpectator;
+	level.streamer = ::menuStreamer;
 	level.weapon = ::menuWeapon;
 
 	level.spawnPlayer = ::spawnPlayer;
@@ -152,7 +153,6 @@ main()
 }
 
 
-
 // This function is called when cvar changes value.
 // Is also called when cvar is registered
 // Return true if cvar was handled here, otherwise false
@@ -221,6 +221,7 @@ precache()
 	precacheString(&"PLATFORM_HOLD_TO_DEFUSE_EXPLOSIVES");
 	precacheModel("xmodel/mp_tntbomb");
 	precacheModel("xmodel/mp_tntbomb_obj");
+	precacheStatusIcon("compassping_enemyfiring"); // for streamers
 
 	precacheString2("STRING_ROUND", &"Round");
 	precacheString2("STRING_ROUND_STARTING", &"Starting");
@@ -231,8 +232,6 @@ precache()
 
 	// HUD: Strattime
 	precacheString2("STRING_STRAT_TIME", &"Strat Time");
-
-	precacheString2("STRING_SPECTATOR_KILLCAM_REPLAY", &"Spectator killcam replay");
 }
 
 // Called after the <gametype>.gsc::main() and <map>.gsc::main() scripts are called
@@ -257,10 +256,6 @@ onStartGameType()
 		game["allies_score"] = 0;
 		game["axis_score"] = 0;
 
-		// For spectators
-		game["allies_score_history"] = "";
-		game["axis_score_history"] = "";
-
 		// Half-separed scoresg
 		game["half_1_allies_score"] = 0;
 		game["half_1_axis_score"] = 0;
@@ -457,7 +452,10 @@ onConnected()
 	else
 	{
 		// If is team selected from last round, set the real team variable
-		self.sessionteam = self.pers["team"];
+		team = self.pers["team"];
+		if (team == "streamer")
+			team = "spectator";
+		self.sessionteam = team;
 	}
 
 	// Define default variables specific for this gametype
@@ -491,7 +489,7 @@ onAfterConnected()
 	}
 
 	// Spectator team
-	else if (self.pers["team"] == "spectator")
+	else if (self.pers["team"] == "spectator" || self.pers["team"] == "streamer")
 		spawnSpectator();
 
 	// If team is selected
@@ -507,6 +505,14 @@ onAfterConnected()
 
 	else
 		assertMsg("Unknown team");
+
+/*	TODO delayed
+	// Run thread on player to keep max ammo in strattime
+	if (level.in_strattime)
+	{
+		self thread strattime_keepMaxAmmo();
+	}
+*/
 }
 
 
@@ -1084,12 +1090,20 @@ spawnSpectator(origin, angles)
 
 	if(self.pers["team"] == "spectator")
 		self.statusicon = "";
+	else if(self.pers["team"] == "streamer")
+		self.statusicon = "compassping_enemyfiring"; // recording icon
 	else if (self.pers["team"] == "allies" || self.pers["team"] == "axis") // dead team spectartor
 		self.statusicon = "hud_status_dead";
 
 
 	if(isdefined(origin) && isdefined(angles))
 		self spawn(origin, angles);
+
+	else if(self.pers["team"] == "streamer")
+	{
+		// TODO
+	}
+
 	else
 	{
  		spawnpointname = "mp_global_intermission";
@@ -1116,10 +1130,14 @@ spawnSpectator(origin, angles)
 
 
 	// If is real spectator (is in team spectator, not session state spectator)
-	if(self.pers["team"] == "spectator")
+	if (self.pers["team"] == "spectator")
 	{
 		self notify("spawned_spectator");
 	}
+	else if (self.pers["team"] == "streamer")
+	{
+		self notify("spawned_streamer");
+	}
 }
 
 spawnIntermission()
@@ -1158,11 +1176,13 @@ spawnIntermission()
 	if(isdefined(level.bombmodel))
 		level.bombmodel stopLoopSound();
 
-  // Open alternative scoreboard
+	// Open alternative scoreboard
 	self openMenu(game["menu_scoreboard"]);
 	self setClientCvar2("g_scriptMainMenu", game["menu_ingame"]);
 	self setClientCvar2("ui_allow_weaponchange", 0);
 	self setClientCvar2("ui_allow_changeteam", 0);
+	self thread maps\mp\gametypes\_menu_scoreboard::generatePlayerList();
+
 
 	// Notify "spawned" notifications
 	self notify("spawned");
@@ -1263,7 +1283,7 @@ startRound()
 	{
 		player = players[i];
 
-		if (player.pers["team"] == "none" || player.pers["team"] == "spectator")
+		if(player.pers["team"] != "allies" && player.pers["team"] != "axis")
 			continue;
 
 		// Players on a team but without a weapon or dead show as dead since they can not get in this round
@@ -1314,6 +1334,105 @@ strattime_end_ontimeout()
 	level notify("strat_time_end");
 }
 
+/*
+TODO delayed
+strattime_keepMaxAmmo()
+{
+	self endon("disconnect");
+
+	last_weapon1 = "";
+	last_weapon2 = "";
+
+	last_weapon1_clipAmmo = 0;
+	last_weapon2_clipAmmo = 0;
+
+	weapon1_maxClipAmmo = 1;
+	weapon2_maxClipAmmo = 1;
+
+	weapon1_pauseGivingMaxAmmo = 0;
+	weapon2_pauseGivingMaxAmmo = 0;
+
+	for (;;)
+	{
+		wait level.frame;
+
+		if (!level.in_strattime)
+			return;
+
+		if (weapon1_pauseGivingMaxAmmo > 0) weapon1_pauseGivingMaxAmmo--;
+		if (weapon2_pauseGivingMaxAmmo > 0) weapon2_pauseGivingMaxAmmo--;
+
+
+		if((self.pers["team"] != "allies" && self.pers["team"] != "axis") || self.sessionstate != "playing")
+		{
+			last_weapon1 = "";
+			last_weapon2 = "";
+			weapon1_maxClipAmmo = 1;
+			weapon2_maxClipAmmo = 1;
+			continue;
+		}
+
+		weapon1 = self getweaponslotweapon("primary");
+		weapon2 = self getweaponslotweapon("primaryb");
+
+		weapon1_clipAmmo = self getweaponslotclipammo("primary");
+		weapon2_clipAmmo = self getweaponslotclipammo("primaryb");
+
+
+		// If weapons changed in slots, save the maximum ammo in slot
+		if (weapon1 != last_weapon1)
+		{
+			weapon1_maxClipAmmo = weapon1_clipAmmo;
+			//self iprintln("Primary changed " + weapon1_maxClipAmmo);
+
+			last_weapon1_clipAmmo = weapon1_clipAmmo;
+		}
+		if (weapon2 != last_weapon2)
+		{
+			weapon2_maxClipAmmo = weapon2_clipAmmo;
+			//self iprintln("Secondary changed" + weapon2_maxClipAmmo);
+
+			last_weapon2_clipAmmo = weapon2_clipAmmo;
+		}
+
+		last_weapon1 = weapon1;
+		last_weapon2 = weapon2;
+
+		// Weapon fired - for 1 seconds give -1 less ammo to allow reload
+		if (weapon1_clipAmmo < last_weapon1_clipAmmo)
+			weapon1_pauseGivingMaxAmmo = int(level.sv_fps / 1); // how many frames to wait
+		if (weapon2_clipAmmo < last_weapon2_clipAmmo)
+			weapon2_pauseGivingMaxAmmo = int(level.sv_fps / 1); // how many frames to wait
+
+		last_weapon1_clipAmmo = weapon1_clipAmmo;
+		last_weapon2_clipAmmo = weapon2_clipAmmo;
+
+
+		current = self getcurrentweapon();
+
+		// For example player is on ladder
+		if(current == "none")
+			continue;
+
+		// Imidietly after firing give player -1 less ammo to allow reloading animation
+		new_weapon1_clipAmmo = weapon1_maxClipAmmo;
+		if (weapon1_pauseGivingMaxAmmo != 0 && new_weapon1_clipAmmo > 0)
+			new_weapon1_clipAmmo--;
+		new_weapon2_clipAmmo = weapon2_maxClipAmmo;
+		if (weapon2_pauseGivingMaxAmmo != 0 && new_weapon2_clipAmmo > 0)
+			new_weapon2_clipAmmo--;
+
+		// Give ammo
+		// Primary
+		if(current == weapon1)
+			self setweaponclipammo(current, new_weapon1_clipAmmo);
+		// Secondary
+		else if (current == weapon2)
+			self setweaponclipammo(current, new_weapon2_clipAmmo);
+	}
+}
+*/
+
 HUD_Clock(countDownTime)
 {
 	level.clock = newHudElem2();
@@ -1341,6 +1460,60 @@ HUD_Clock(countDownTime)
 		level.clock.x = 0;
 	}
 
+	timeForOrange = 30;
+	timeForRed = 15;
+
+
+	waitTime = countDownTime - timeForOrange - 0.3;
+	if (waitTime <= 0)
+		return;
+
+	wait waitTime * level.fps_multiplier;
+	if (!isDefined(level.clock) || level.roundended || level.bombplanted)
+		return;
+
+	// Orange
+	level.clock.color = (1, 0.6, 0.15);
+
+	waitTime = countDownTime - waitTime - timeForRed;
+	if (waitTime <= 0)
+		return;
+
+	wait waitTime * level.fps_multiplier;
+	if (!isDefined(level.clock) || level.roundended || level.bombplanted)
+		return;
+
+	// Red
+	level.clock.color = (1, 0.25, 0.25);
+}
+
+HUD_Clock_Bomb(countDownTime)
+{
+	level.clock = newHudElem2();
+	level.clock.font = "default";
+	level.clock.fontscale = 2;
+	level.clock.horzAlign = "center_safearea";
+	level.clock.vertAlign = "top";
+	level.clock.alignX = "left";
+	level.clock.alignY = "top";
+	level.clock.color = (1, 1, 1);
+	level.clock.x = 0;
+	level.clock.y = 445;
+	level.clock setTimer(countDownTime);
+
+	// If strattime is enabled, show fade-in animation
+	if (level.strat_time > 0)
+	{
+		level.clock.alpha = 0;
+
+		level.clock FadeOverTime(0.5);
+		level.clock.alpha = 1;
+
+		level.clock.x = 40;
+		level.clock moveovertime(0.5);
+		level.clock.x = 0;
+	}
+
 
 	waitTime = countDownTime - 30 - 0.3;
 	if (waitTime <= 0)
@@ -1452,6 +1625,100 @@ HUD_RoundInfo(time)
 
 
 
+// self is bomb trigger
+HUD_ShowBombTimers()
+{
+	self endon("bomb_defused");
+	self endon("bomb_exploded");
+
+	countDownTime = level.bombtimer; // seconds
+
+	level.bombtimerhud = addHUD(6, 76, undefined, undefined, "left", "top", "left", "top");
+	level.bombtimerhud showHUDSmooth(0.1);
+	//level.bombtimerhud.foreground = true;  // visible if menu opened
+	level.bombtimerhud setClock(countDownTime, 60, "hudStopwatch", 48, 48);
+
+
+	level.clock = newHudElem2();
+	level.clock.font = "default";
+	level.clock.fontscale = 1.5;
+	level.clock.horzAlign = "center_safearea";
+	level.clock.vertAlign = "top";
+	level.clock.alignX = "center";
+	level.clock.alignY = "top";
+	level.clock.color = (1, 1, 1);
+	level.clock.x = 0;
+	level.clock.y = 445;
+	//level.clock setTimer(countDownTime - 1.1);
+
+
+	time_start = gettime();
+	value_old = 0;
+	color_old = (1, 1, 1);
+	for(;;)
+	{
+		remaining = level.bombtimer - (gettime() - time_start) / 1000; // decimal seconds
+
+		if (remaining < 20)
+			value = int(remaining * 10) / 10;
+		else
+			value = int(remaining);
+
+		if (value < 0)
+			value = 0;
+
+		if (value != value_old)
+		{
+			level.clock setValue(value);
+
+			color = (1, 1, 1);
+			if      (value < 15)	color = (1, 0.25, 0.25); // Red
+			else if (value < 20) 	color = (1, 0.6, 0.15); // Orange
+
+			if (color != color_old)
+			{
+				level.clock.color = color;
+				color_old = color_old;
+			}
+
+			value_old = value;
+		}
+
+		wait level.fps_multiplier * 0.1;
+	}
+}
+
+// Called when bomb exploded or bomb is defused
+HUD_DeleteBombTimers()
+{
+	if (isDefined(level.bombtimerhud))
+		level.bombtimerhud removeHUD();
+
+	// Set real remaining time
+	if (isDefined(level.clock))
+	{
+		if (level.bombexploded)
+		{
+			level.clock removeHUD();
+		}
+		else
+		{
+			remaining = level.bombtimer - (level.bombtimerend - level.bombtimerstart) / 1000; // decimal seconds
+
+			// Update time to more precision if time was less than 0.5 second
+			if (remaining < 0.5)
+			{
+				value = int(remaining * 100) / 100;
+				if (value < 0) value = 0;
+				level.clock setValue(value);
+			}
+			level.clock.color = (1, 1, 1);
+		}
+	}
+}
+
+
+
 /*
               __
   Round     (    )
@@ -1614,21 +1881,7 @@ endRound(roundwinner)
 	setTeamScore("axis", game["axis_score"]);
 
 	// History score for spectators
-	if(roundwinner == "allies")
-	{
-		game["allies_score_history"] += "^2#";
-		game["axis_score_history"] += "^1=";
-	}
-	else if(roundwinner == "axis")
-	{
-		game["allies_score_history"] += "^1=";
-		game["axis_score_history"] += "^2#";
-	}
-	else // draw
-	{
-		game["allies_score_history"] += "^7-";
-		game["axis_score_history"] += "^7-";
-	}
+	level maps\mp\gametypes\_spectating_system_hud::ScoreProgress_AddWinner(roundwinner);
 
 
 	// Update score
@@ -1768,55 +2021,8 @@ endRound(roundwinner)
 	}
 
 
-	// Check if some spectator is in killcam
-	in_killcam = level isSpectatorInKillcam();
-	if (in_killcam)
-	{
-		// HUD
-		hud = addHUD(-85, 280, 1.2, (1,1,0), "center", "middle", "right");
-		hud showHUDSmooth(.5);
-		hud setText(game["STRING_SPECTATOR_KILLCAM_REPLAY"]);
-
-		// Disable players weapons
-		players = getentarray("player", "classname");
-		for(i = 0; i < players.size; i++)
-		{
-			player = players[i];
-			if (player.sessionstate == "playing")
-				player disableWeapon();
-		}
-
-		for (i = 0; i < level.weaponnames.size; i++)
-		{
-			weapon = level.weaponnames[i];
-
-			// Delete weapons in map
-			weapons = getentarray("weapon_" + weapon, "classname");
-			for(j = 0; j < weapons.size; j++)
-			{
-				weapons[j] delete();
-			}
-		}
-
-		count = 2;
-		for(;;)
-		{
-			wait level.fps_multiplier * 1;
-			in_killcam = level isSpectatorInKillcam();
-
-			if (!in_killcam)
-				count--;
-			else
-				count = 2;
-
-			if (count <= 0)
-				break;
-		}
-
-		hud hideHUDSmooth(.5);
-
-		wait level.fps_multiplier * 0.5;
-	}
+	// Wait for spectators in killcam
+	level maps\mp\gametypes\_spectating_system::waitForSpectatorsInKillcam();
 
 	// Used for balance team at the end of the round
 	level notify("restarting");
@@ -1828,25 +2034,6 @@ endRound(roundwinner)
 }
 
 
-isSpectatorInKillcam()
-{
-	in_killcam = false;
-
-	players = getentarray("player", "classname");
-	for(i = 0; i < players.size; i++)
-	{
-		player = players[i];
-
-		if (player.sessionstate == "spectator" && isDefined(player.killcam) && player.killcam == true)
-		{
-			in_killcam = true;
-			break;
-		}
-	}
-
-	return in_killcam;
-}
-
 checkTimeLimit()
 {
 	if (level.timelimit > 0 && game["timepassed"] >= level.timelimit)
@@ -2299,15 +2486,15 @@ bombzone_think(bombzone_other)
 
 					level thread soundPlanted(player);
 
+					// Remove clock if bomb is planted
+					if (isDefined(level.clock))
+						level.clock removeHUD();
+
 					bombtrigger thread bomb_think();
 					bombtrigger thread bomb_countdown();
 
 					level notify("bomb_planted");
 
-					// Remove clock if bomb is planted
-					if (isDefined(level.clock))
-						level.clock removeHUD();
-
 					return;	//TEMP, script should stop after the wait level.frame
 				}
 				else
@@ -2337,7 +2524,7 @@ bomb_countdown()
 
 	//PAM
 	if (level.show_bombtimer)
-		thread showBombTimers();
+		self thread HUD_ShowBombTimers();
 	level.bombmodel playLoopSound("bomb_tick");
 
 	wait level.fps_multiplier * level.bombtimer;
@@ -2346,11 +2533,14 @@ bomb_countdown()
 	objective_delete(0);
 	thread maps\mp\gametypes\_objpoints::removeTeamObjpoints("allies");
 	thread maps\mp\gametypes\_objpoints::removeTeamObjpoints("axis");
-	thread deleteBombTimers();
 
 	level.bombexploded = true;
+	level.bombtimerend = gettime();
 	self notify("bomb_exploded");
 
+	// Stop timers
+	thread HUD_DeleteBombTimers();
+
 	// Call object explosion
 	if(isdefined(level.bombexploder))
 		maps\mp\_utility::exploder(level.bombexploder);
@@ -2461,9 +2651,13 @@ bomb_think()
 					objective_delete(0);
 					thread maps\mp\gametypes\_objpoints::removeTeamObjpoints("allies");
 					thread maps\mp\gametypes\_objpoints::removeTeamObjpoints("axis");
-					thread deleteBombTimers();
+
+					level.bombtimerend = gettime();
 
 					self notify("bomb_defused");
+
+					thread HUD_DeleteBombTimers();
+
 					level.bombmodel stopLoopSound();
 					level.bombglow delete();
 					self delete();
@@ -2565,22 +2759,6 @@ sayObjectiveIfPlayerIsNotMoving(sound)
 	self playLocalSound(sound);
 }
 
-showBombTimers()
-{
-	timeleft = (level.bombtimer - (getTime() - level.bombtimerstart) / 1000);
-
-	level.bombtimerhud = addHUD(6, 76, undefined, undefined, "left", "top", "left", "top");
-	level.bombtimerhud showHUDSmooth(0.1);
-	//level.bombtimerhud.foreground = true;  // visible if menu opened
-	level.bombtimerhud setClock(timeleft, 60, "hudStopwatch", 48, 48);
-}
-
-deleteBombTimers()
-{
-	if (isDefined(level.bombtimerhud))
-		level.bombtimerhud removeHUD();
-}
-
 announceWinner(winner, delay)
 {
 	wait level.fps_multiplier * delay;
@@ -2636,7 +2814,7 @@ menuAutoAssign()
 	{
 		player = players[i];
 
-		if(player.pers["team"] == "spectator" || player.pers["team"] == "none")
+		if(player.pers["team"] != "allies" && player.pers["team"] != "axis")
 			continue;
 
 		numonteam[player.pers["team"]]++;
@@ -2782,6 +2960,37 @@ menuSpectator()
 	level notify("joined", "spectator", self); // used in first round to check if someone joined team
 }
 
+menuStreamer()
+{
+	if(self.pers["team"] == "streamer")
+		return;
+
+	self.joining_team = "streamer";
+	self.leaving_team = self.pers["team"];
+
+	if(isAlive(self))
+	{
+		self.switching_teams = true;
+		self suicide();
+	}
+
+	self.sessionteam = "spectator";
+	self.statusicon = "";
+	self.pers["team"] = "streamer";
+	self.pers["weapon"] = undefined;
+	self.pers["weapon1"] = undefined;
+	self.pers["weapon2"] = undefined;
+	self.pers["savedmodel"] = undefined;
+
+
+	spawnSpectator();
+
+	self notify("joined", "streamer");
+	self notify("joined_streamers");
+
+	level notify("joined", "streamer", self); // used in first round to check if someone joined team
+}
+
 menuWeapon(response)
 {
 	// You has to be "allies" or "axis" to change a weapon
@@ -3002,6 +3211,7 @@ soundPlanted(player)
 	level playSoundOnPlayers(alliedsound, "allies");
 	level playSoundOnPlayers(axissound, "axis");
 	level playSoundOnPlayers(alliedsound, "spectator");
+	level playSoundOnPlayers(alliedsound, "streamer");
 /*
 	wait level.fps_multiplier * 1.5;
 
diff --git a/source/maps/mp/gametypes/strat.gsc b/source/maps/mp/gametypes/strat.gsc
index d64f43e..8243579 100644
--- a/source/maps/mp/gametypes/strat.gsc
+++ b/source/maps/mp/gametypes/strat.gsc
@@ -27,6 +27,7 @@ main()
 	level.allies = ::menuAllies;
 	level.axis = ::menuAxis;
 	level.spectator = ::menuSpectator;
+	level.streamer = ::menuStreamer;
 	level.weapon = ::menuWeapon;
 
 	level.spawnPlayer = ::spawnPlayer;
@@ -45,6 +46,8 @@ main()
 // Is called only once per map
 precache()
 {
+	precacheStatusIcon("compassping_enemyfiring"); // for streamers
+
 	precacheString2("STRING_FLY_ENABLED", &"Enabled");
 	precacheString2("STRING_FLY_DISABLED", &"Disabled");
 	precacheString2("STRING_ENABLE_HOLD_SHIFT", &"Enable: Hold ^3Bash");
@@ -170,7 +173,10 @@ onConnected()
 	else
 	{
 		// If is team selected from last round, set the real team variable
-		self.sessionteam = self.pers["team"];
+		team = self.pers["team"];
+		if (team == "streamer")
+			team = "spectator";
+		self.sessionteam = team;
 	}
 
 	// Define default variables specific for this gametype
@@ -182,7 +188,7 @@ onConnected()
 onAfterConnected()
 {
 	// Spectator team
-	if (self.pers["team"] == "none" || self.pers["team"] == "spectator")
+	if (self.pers["team"] == "none" || self.pers["team"] == "spectator" || self.pers["team"] == "streamer")
 		spawnSpectator();
 
 	// If team is selected
@@ -539,7 +545,7 @@ menuAutoAssign()
 	{
 		player = players[i];
 
-		if(player.pers["team"] == "spectator" || player.pers["team"] == "none")
+		if(player.pers["team"] != "allies" && player.pers["team"] != "axis")
 			continue;
 
 		numonteam[player.pers["team"]]++;
@@ -663,6 +669,33 @@ menuSpectator()
 	level notify("joined", "spectator", self); // used in first round to check if someone joined team
 }
 
+menuStreamer()
+{
+	if(self.pers["team"] == "streamer")
+		return;
+
+	self.joining_team = "streamer";
+	self.leaving_team = self.pers["team"];
+
+	if(isAlive(self))
+	{
+		self.switching_teams = true;
+		self suicide();
+	}
+
+	self.sessionteam = "spectator";
+	self.pers["team"] = "streamer";
+	self.pers["weapon"] = undefined;
+	self.pers["savedmodel"] = undefined;
+
+	spawnSpectator();
+
+	self notify("joined", "streamer");
+	self notify("joined_streamers");
+
+	level notify("joined", "streamer", self); // used in first round to check if someone joined team
+}
+
 menuWeapon(response)
 {
 	// You has to be "allies" or "axis" to change a weapon
@@ -881,7 +914,7 @@ Key_AddBot()
 	for(;;)
 	{
 		waittime = 0;
-		while (self meleebuttonpressed() && self useButtonPressed())
+		while (self meleebuttonpressed() && self useButtonPressed() && self.sessionstate == "playing")
 		{
 			waittime += level.frame;
 
@@ -911,7 +944,7 @@ Key_RecordBot()
 	for(;;)
 	{
 		waittime = 0;
-		while (self attackbuttonpressed() && self useButtonPressed() && !self meleebuttonpressed())
+		while (self attackbuttonpressed() && self useButtonPressed() && !self meleebuttonpressed() && self.sessionstate == "playing")
 		{
 			waittime += level.frame;
 
@@ -945,7 +978,7 @@ Key_PlayRecord()
 	for(;;)
 	{
 		waittime = 0;
-		while (self useButtonPressed() && !self attackbuttonpressed() && !self meleebuttonpressed())
+		while (self useButtonPressed() && !self attackbuttonpressed() && !self meleebuttonpressed() && self.sessionstate == "playing")
 		{
 			waittime += level.frame;
 
@@ -1318,6 +1351,10 @@ handle_bot(player)
 		self linkto(self.botLockPosition);
 		self disableWeapon();
 
+		// Remove head icon
+		self.headicon = "";
+		self.headiconteam = "none";
+
 		while(isAlive(self))	wait level.fps_multiplier * 1;
 	}
 }
diff --git a/source/maps/mp/gametypes/tdm.gsc b/source/maps/mp/gametypes/tdm.gsc
index e1a6e57..383c75a 100644
--- a/source/maps/mp/gametypes/tdm.gsc
+++ b/source/maps/mp/gametypes/tdm.gsc
@@ -27,6 +27,7 @@ main()
 	level.allies = ::menuAllies;
 	level.axis = ::menuAxis;
 	level.spectator = ::menuSpectator;
+	level.streamer = ::menuStreamer;
 	level.weapon = ::menuWeapon;
 
 	level.spawnPlayer = ::spawnPlayer;
@@ -81,6 +82,8 @@ onCvarChanged(cvar, value, isRegisterTime)
 // Is called only once per map
 precache()
 {
+	precacheStatusIcon("compassping_enemyfiring"); // for streamers
+
 	// HUD: Strattime
 	precacheString2("STRING_STRAT_TIME", &"Strat Time");
 }
@@ -263,7 +266,10 @@ onConnected()
 	else
 	{
 		// If is team selected from last round, set the real team variable
-		self.sessionteam = self.pers["team"];
+		team = self.pers["team"];
+		if (team == "streamer")
+			team = "spectator";
+		self.sessionteam = team;
 	}
 
 	// Define default variables specific for this gametype
@@ -295,7 +301,7 @@ onAfterConnected()
 	}
 
 	// Spectator team
-	else if (self.pers["team"] == "spectator")
+	else if (self.pers["team"] == "spectator" || self.pers["team"] == "streamer")
 		spawnSpectator();
 
 	// If team is selected
@@ -592,6 +598,8 @@ spawnSpectator(origin, angles)
 
 	if(self.pers["team"] == "spectator")
 		self.statusicon = "";
+	else if(self.pers["team"] == "streamer")
+		self.statusicon = "compassping_enemyfiring"; // recording icon
 	else if (self.pers["team"] == "allies" || self.pers["team"] == "axis") // dead team spectartor
 		self.statusicon = "hud_status_dead";
 
@@ -616,10 +624,14 @@ spawnSpectator(origin, angles)
 	self notify("spawned");
 
 	// If is real spectator (is in team spectator, not session state spectator)
-	if(self.pers["team"] == "spectator")
+	if (self.pers["team"] == "spectator")
 	{
 		self notify("spawned_spectator");
 	}
+	else if (self.pers["team"] == "streamer")
+	{
+		self notify("spawned_streamer");
+	}
 }
 
 spawnIntermission()
@@ -974,7 +986,7 @@ menuAutoAssign()
 	{
 		player = players[i];
 
-		if(player.pers["team"] == "spectator" || player.pers["team"] == "none")
+		if(player.pers["team"] != "allies" && player.pers["team"] != "axis")
 			continue;
 
 		numonteam[player.pers["team"]]++;
@@ -1102,6 +1114,34 @@ menuSpectator()
 	level notify("joined", "spectator", self); // used in first round to check if someone joined team
 }
 
+menuStreamer()
+{
+	if(self.pers["team"] == "streamer")
+		return;
+
+	self.joining_team = "streamer";
+	self.leaving_team = self.pers["team"];
+
+	if(isAlive(self))
+	{
+		self.switching_teams = true;
+		self suicide();
+	}
+
+	self.sessionteam = "spectator";
+	self.statusicon = "";
+	self.pers["team"] = "streamer";
+	self.pers["weapon"] = undefined;
+	self.pers["savedmodel"] = undefined;
+
+	spawnSpectator();
+
+	self notify("joined", "streamer");
+	self notify("joined_streamers");
+
+	level notify("joined", "streamer", self); // used in first round to check if someone joined team
+}
+
 menuWeapon(response)
 {
 	// You has to be "allies" or "axis" to change a weapon
diff --git a/source/materials/a_training_target b/source/materials/a_training_target
new file mode 100644
index 0000000..abd41ea
Binary files /dev/null and b/source/materials/a_training_target differ
diff --git a/source/soundaliases/zpam_sound.csv b/source/soundaliases/zpam_sound.csv
index 63c5f18..bb7cba9 100644
--- a/source/soundaliases/zpam_sound.csv
+++ b/source/soundaliases/zpam_sound.csv
@@ -5,15 +5,25 @@ US_0_order_move_generic_05,,Battlechatter/US/0/US_0_order_move_generic_05.wav,0.
 
 
 
-# Original sound aliases for weapon swap
+# Original sound aliases for weapon swap (canceled out)
 weap_raise,,null.wav,0,,,,,,,,,,,,,,,,
 
-# New name for weapon change sound to be manually controled by script
+# New name for weapon change sound to be manually played by script
 zpam_weap_raise,,misc/wpnarm_2.wav,0.45,0.5,wpnplyr,0.9,1.2,7,500,auto,,,,,,,weap_raise_layer,
 
-# Original sound aliases for weapon swap (comented)
-#name,sequence,file,vol_min,vol_max,vol_mod,pitch_min,pitch_max,dist_min,dist_max,channel,type,probability,loop,masterslave,loadspec,subtitle,compression,secondaryaliasname,volumefalloffcurve,startdelay,speakermap,reverb,lfe percentage
-#weap_raise,,misc/wpnarm_2.wav,0.45,0.5,wpnplyr,0.9,1.2,7,500,auto,,,,,,,,weap_raise_layer,
-#weap_raise_layer,1,misc/pu_weapon01.wav,0.25,0.3,wpnplyr,0.9,0.9,7,500,auto,,,,,,,,,
-#weap_raise_layer,2,misc/pu_weapon02.wav,0.18,0.23,wpnplyr,0.9,0.9,7,500,auto,,,,,,,,,
-#weap_raise_layer,3,misc/pu_weapon04.wav,0.25,0.3,wpnplyr,0.9,0.9,7,500,auto,,,,,,,,,
+# Original sound aliases for weapon swap (these are here only for clarity, they are commented)
+# name,sequence,file,vol_min,vol_max,vol_mod,pitch_min,pitch_max,dist_min,dist_max,channel,type,probability,loop,masterslave,loadspec,subtitle,compression,secondaryaliasname,volumefalloffcurve,startdelay,speakermap,reverb,lfe percentage
+# weap_raise,,misc/wpnarm_2.wav,0.45,0.5,wpnplyr,0.9,1.2,7,500,auto,,,,,,,,weap_raise_layer,
+# weap_raise_layer,1,misc/pu_weapon01.wav,0.25,0.3,wpnplyr,0.9,0.9,7,500,auto,,,,,,,,,
+# weap_raise_layer,2,misc/pu_weapon02.wav,0.18,0.23,wpnplyr,0.9,0.9,7,500,auto,,,,,,,,,
+# weap_raise_layer,3,misc/pu_weapon04.wav,0.25,0.3,wpnplyr,0.9,0.9,7,500,auto,,,,,,,,,
+
+
+# Weapon drop sound
+zpam_weap_drop,,misc/gun_drop01.wav,0.38,0.45,wpnplyr,0.9,0.9,7,500,auto,,,,,,,,,
+
+
+# Aim trainer missed shot
+aim_trainer_spawn,,misc/bomb_plant_notick01.wav,0.05,0.05,,1,1,,,auto2d,,,,,,,,,,
+aim_trainer_hit,,weapons/impact/Impact_Metal_A07.wav,0.7,0.7,,1,1,,,auto2d,,,,,,,,,,
+aim_trainer_missed_shot,,weapons/impact/bullet_water05.wav,1,1,,2,2,,,auto2d,,,,,,,,,,
diff --git a/source/ui_mp/connect.menu b/source/ui_mp/connect.menu
index cf4c4c0..d16167d 100644
--- a/source/ui_mp/connect.menu
+++ b/source/ui_mp/connect.menu
@@ -80,7 +80,7 @@
 			hidedvar { "0" }
 		}
 
-
+/*
 		itemDef
 		{
 			visible			1
@@ -105,14 +105,14 @@
 			textalign		ITEM_ALIGN_CENTER
 			decoration
 		}
+*/
 
-/*
 		itemDef
 		{
 			visible			1
 			origin			447 15
 			forecolor		1 1 1  1
-			text			"You are playing on server with ^1zPAM3.32 TEST 2" // ZPAM_RENAME
+			text			"You are playing on server with ^2zPAM3.33 ^3LAN" // ZPAM_RENAME
 			textfont		UI_FONT_NORMAL
 			textscale		0.2
 			textstyle		ITEM_TEXTSTYLE_SHADOWED
@@ -124,14 +124,14 @@
 			visible			1
 			origin			447 28
 			forecolor		1 1 1 0.8
-			text			"^1Unreleased version"
+			text			"^3Created for Budapest LAN"
 			textfont		UI_FONT_NORMAL
 			textscale		0.2
 			textstyle		ITEM_TEXTSTYLE_SHADOWED
 			textalign		ITEM_ALIGN_CENTER
 			decoration
 		}
-*/
+
 
 	}
 }
diff --git a/source/ui_mp/hud.menu b/source/ui_mp/hud.menu
index 093b405..e833209 100644
--- a/source/ui_mp/hud.menu
+++ b/source/ui_mp/hud.menu
@@ -27,53 +27,6 @@
 			#include "ui_mp/scriptmenus/submenus/matchinfo_hud.menu"
 	}
 
-
-
-	menuDef
-	{
-	  	name spectatingsystem_left
-	  	fullScreen MENU_FALSE
-	  	visible MENU_TRUE
-	    	rect 0 160 200 40 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
-
-		#include "ui_mp/scriptmenus/submenus/spectatingsystem_left.menu"
-	}
-
-	menuDef
-	{
-	  	name spectatingsystem_right
-	  	fullScreen MENU_FALSE
-	  	visible MENU_TRUE
-	    	rect 0 160 200 40 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP
-
-		#include "ui_mp/scriptmenus/submenus/spectatingsystem_right.menu"
-	}
-
-	menuDef
-	{
-	  	name spectatingsystem_players
-	  	fullScreen MENU_FALSE
-	  	visible MENU_TRUE
-	    	rect 0 0 200 80 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_BOTTOM
-
-
-		ITEM_DVAR("ui_spectatingsystem_team1_scoreProgress", -285, -41, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-		ITEM_DVAR("ui_spectatingsystem_team2_scoreProgress", -285, -31, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-
-		ITEM_DVAR("ui_spectatingsystem_playerProgress", -285, -18, .18, ITEM_ALIGN_LEFT, 1 1 1 1)
-	}
-
-	menuDef
-	{
-	  	name spectatingsystem_killcam_proposing
-	  	fullScreen MENU_FALSE
-	  	visible MENU_TRUE
-	    	rect 0 0 200 80 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_TOP
-
-		ITEM_DVAR("ui_spectatingsystem_killcamProposing", -140, 350, .18, ITEM_ALIGN_LEFT, 1 1 1 1)
-
-	}
-
 	menuDef
 	{
 	  	name enemylist
diff --git a/source/ui_mp/macros.h b/source/ui_mp/macros.h
index 4189b51..5c80c2f 100644
--- a/source/ui_mp/macros.h
+++ b/source/ui_mp/macros.h
@@ -730,6 +730,566 @@ itemDef \
 }
 
 
+
+
+
+
+#define SPECTATINGSYSTEM_COLOR_BLUE 0.16 0.28 0.74 .9
+#define SPECTATINGSYSTEM_COLOR_RED 0.5 0 0 .9
+#define SPECTATINGSYSTEM_COLOR_HIGHLIGHT .9 .9 .9 1
+#define SPECTATINGSYSTEM_COLOR_BG .0 .0 .0 .9
+#define SPECTATINGSYSTEM_COLOR_BG_DEAD .0 .0 .0 .5
+
+#define ITEM_SPECTATINGSYSTEM_LINE(cvarprefix, x_offset, y_offset, horizontal_align) \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 130 25 horizontal_align 0 \
+	origin		-1 -1 \
+	backcolor	SPECTATINGSYSTEM_COLOR_HIGHLIGHT \
+	visible		1 \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "0_";  "10_blue_";"10_red_";  "50_blue_";"50_red_";  "80_blue_"; "80_red_";  "100_blue_";"100_red_" } \
+	decoration \
+} \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 128 23 horizontal_align 0 \
+	backcolor	SPECTATINGSYSTEM_COLOR_BG \
+	visible		1 \
+	dvartest	cvarprefix "_health" \
+	hideDvar	{ ""; "0"; "0_" } \
+	decoration \
+} \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 128 23 horizontal_align 0 \
+	backcolor	SPECTATINGSYSTEM_COLOR_BG_DEAD \
+	visible		1 \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "0"; "0_" } \
+	decoration \
+} \
+\
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 128 12 horizontal_align 0 \
+	backcolor	SPECTATINGSYSTEM_COLOR_BLUE \
+	visible		1 \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "100_blue"; "100_blue_" } \
+	decoration \
+} \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 128 12 horizontal_align 0 \
+	backcolor	SPECTATINGSYSTEM_COLOR_RED \
+	visible		1 \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "100_red"; "100_red_" } \
+	decoration \
+} \
+\
+\
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 104 12 horizontal_align 0 \
+	backcolor	SPECTATINGSYSTEM_COLOR_BLUE \
+	visible		1 \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "80_blue"; "80_blue_" } \
+	decoration \
+} \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 104 12 horizontal_align 0 \
+	backcolor	SPECTATINGSYSTEM_COLOR_RED \
+	visible		1 \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "80_red"; "80_red_" } \
+	decoration \
+} \
+\
+\
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 65 12 horizontal_align 0 \
+	backcolor	SPECTATINGSYSTEM_COLOR_BLUE \
+	visible		1 \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "50_blue"; "50_blue_" } \
+	decoration \
+} \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 65 12 horizontal_align 0 \
+	backcolor	SPECTATINGSYSTEM_COLOR_RED \
+	visible		1 \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "50_red"; "50_red_" } \
+	decoration \
+} \
+\
+\
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 10 12 horizontal_align 0 \
+	backcolor	SPECTATINGSYSTEM_COLOR_BLUE \
+	visible		1 \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "10_blue"; "10_blue_" } \
+	decoration \
+} \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 10 12 horizontal_align 0 \
+	backcolor	SPECTATINGSYSTEM_COLOR_RED \
+	visible		1 \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "10_red"; "10_red_" } \
+	decoration \
+} \
+\
+\
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 10 9 horizontal_align 0 \
+	backcolor	1 1 1 .5 \
+	origin		116 13 \
+	visible		1 \
+	background	"gfx/icons/hud@us_grenade.tga" \
+	dvartest	cvarprefix "_icons" \
+	showDvar	{ "grenade"; "grenade_smoke"; "grenade2_smoke"; "grenade2"; } \
+	decoration \
+} \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 10 9 horizontal_align 0 \
+	backcolor	1 1 1 .5 \
+	origin		113 13 \
+	visible		1 \
+	background	"gfx/icons/hud@us_grenade.tga" \
+	dvartest	cvarprefix "_icons" \
+	showDvar	{ "grenade2"; "grenade2_smoke"; } \
+	decoration \
+} \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 10 9 horizontal_align 0 \
+	backcolor	1 1 1 .5 \
+	origin		107 13 \
+	visible		1 \
+	background	"hud_us_smokegrenade" \
+	dvartest	cvarprefix "_icons" \
+	showDvar	{ "smoke"; "grenade_smoke"; "grenade2_smoke";  } \
+	decoration \
+} \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 15 15 horizontal_align 0 \
+	backcolor	1 1 1 .5 \
+	origin		112 4 \
+	visible		1 \
+	background	"gfx/hud/death_suicide.tga" \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "0"; "0_";  } \
+	decoration \
+} \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 12 10 horizontal_align 0 \
+	origin		132 3 \
+	backcolor	1 1 1 .9 \
+	visible		1 \
+	background	"ui/assets/scrollbar_arrow_left.tga" \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "0_";  "10_blue_";"10_red_";  "50_blue_";"50_red_";  "80_blue_"; "80_red_";  "100_blue_";"100_red_" } \
+	decoration \
+} \
+itemDef \
+{ \
+	style		WINDOW_STYLE_FILLED \
+	rect		x_offset y_offset 12 10 horizontal_align 0 \
+	origin		-14 3 \
+	backcolor	1 1 1 .9 \
+	visible		1 \
+	background	"ui/assets/scrollbar_arrow_right.tga" \
+	dvartest	cvarprefix "_health" \
+	showDvar	{ "0_";  "10_blue_";"10_red_";  "50_blue_";"50_red_";  "80_blue_"; "80_red_";  "100_blue_";"100_red_" } \
+	decoration \
+} \
+itemDef \
+{ \
+	rect			x_offset y_offset 0 0 horizontal_align 0 \
+	origin			5 0 \
+	type			ITEM_TYPE_TEXT \
+	visible			1 \
+	forecolor		1 1 1 1 \
+	textfont		UI_FONT_NORMAL \
+	textscale		.18 \
+	textalign		ITEM_ALIGN_LEFT \
+	textaligny		11 \
+	textstyle		ITEM_TEXTSTYLE_SHADOWED \
+	dvar			cvarprefix "_text" \
+	dvartest		cvarprefix "_health" \
+	hideDvar		{ ""; "0"; "0_" } \
+	decoration \
+} \
+itemDef \
+{ \
+	rect			x_offset y_offset 0 0 horizontal_align 0 \
+	origin			5 0 \
+	type			ITEM_TYPE_TEXT \
+	visible			1 \
+	forecolor		1 1 1 .5 \
+	textfont		UI_FONT_NORMAL \
+	textscale		.18 \
+	textalign		ITEM_ALIGN_LEFT \
+	textaligny		11 \
+	textstyle		ITEM_TEXTSTYLE_SHADOWED \
+	dvar			cvarprefix "_text" \
+	dvartest		cvarprefix "_health" \
+	showDvar		{ "0"; "0_" } \
+	decoration \
+} \
+itemDef \
+{ \
+	rect			x_offset y_offset 0 0 horizontal_align 0 \
+	origin			5 10 \
+	type			ITEM_TYPE_TEXT \
+	visible			1 \
+	forecolor		1 1 1 .8 \
+	textfont		UI_FONT_NORMAL \
+	textscale		.16 \
+	textalign		ITEM_ALIGN_LEFT \
+	textaligny		12 \
+	textstyle		ITEM_TEXTSTYLE_SHADOWED \
+	dvar			cvarprefix "_info" \
+	dvartest		cvarprefix "_health" \
+	hideDvar		{ ""; "0"; "0_" } \
+	decoration \
+} \
+itemDef \
+{ \
+	rect			x_offset y_offset 0 0 horizontal_align 0 \
+	origin			5 10 \
+	type			ITEM_TYPE_TEXT \
+	visible			1 \
+	forecolor		1 1 1 .5 \
+	textfont		UI_FONT_NORMAL \
+	textscale		.16 \
+	textalign		ITEM_ALIGN_LEFT \
+	textaligny		12 \
+	textstyle		ITEM_TEXTSTYLE_SHADOWED \
+	dvar			cvarprefix "_info" \
+	dvartest		cvarprefix "_health" \
+	showDvar		{ "0"; "0_" } \
+	decoration \
+}
+
+
+
+#define ITEM_SPECTATINGSYSTEM_KEY(textstring, x, y, fontSize, horizontal_align, cvar) \
+itemDef \
+{ \
+	visible			1 \
+	rect			0 0 1 1 horizontal_align 0 \
+	origin			x y \
+	forecolor		GLOBAL_UNFOCUSED_COLOR \
+	type			ITEM_TYPE_TEXT \
+	text			textstring \
+	textfont		UI_FONT_NORMAL \
+	textscale		fontSize \
+	dvartest		cvar \
+	showDvar		{ "1"; } \
+	decoration \
+}
+
+
+#define ITEM_SPECTATINGSYSTEM_DVAR(x, y, fontsize, cvar, horizontal_align) \
+itemDef \
+{ \
+	visible			1 \
+	rect			0 0 0 0 horizontal_align 0 \
+	origin			x y \
+	forecolor		GLOBAL_UNFOCUSED_COLOR \
+	type			ITEM_TYPE_TEXT \
+	textfont		UI_FONT_NORMAL \
+	textscale		fontsize \
+	textstyle		ITEM_TEXTSTYLE_SHADOWED \
+	dvar			cvar \
+	decoration \
+}
+
+
+
+
+
+
+#define SCOREBOARD_TEXT_ALIGNY 10
+#define SCOREBOARD_HEADING_ALIGNY 25
+
+// Text headings of columns
+#define SCOREBOARD_SCORE_TEXT_X 174
+#define SCOREBOARD_KILLS_TEXT_X 210
+#define SCOREBOARD_DEATHS_TEXT_X 228
+#define SCOREBOARD_ASSISTS_TEXT_X 264
+#define SCOREBOARD_DAMAGE_TEXT_X 294
+#define SCOREBOARD_GRENADES_TEXT_X 324
+#define SCOREBOARD_PLANTS_TEXT_X 354
+#define SCOREBOARD_DEFUSES_TEXT_X 388
+#define SCOREBOARD_DEFUSES_TEXT_X_LINE 384	// last one is aligned right
+
+// Columns
+#define SCOREBOARD_HEADING_X 15
+#define SCOREBOARD_NAME_X 33
+
+#define SCOREBOARD_SCORE_X 167
+#define SCOREBOARD_KILLS_X 209
+#define SCOREBOARD_DEATHS_X 226
+#define SCOREBOARD_ASSISTS_X 262
+#define SCOREBOARD_DAMAGE_X 288
+#define SCOREBOARD_GRENADES_X 322
+#define SCOREBOARD_PLANTS_X 352
+#define SCOREBOARD_DEFUSES_X 382
+#define SCOREBOARD_PING_X 420
+
+
+
+#define SCOREBOARD_LINE_1_Y  30
+#define SCOREBOARD_LINE_2_Y  40
+#define SCOREBOARD_LINE_3_Y  50
+#define SCOREBOARD_LINE_4_Y  59
+#define SCOREBOARD_LINE_5_Y  69
+#define SCOREBOARD_LINE_6_Y  79
+#define SCOREBOARD_LINE_7_Y  88
+#define SCOREBOARD_LINE_8_Y  98
+#define SCOREBOARD_LINE_9_Y  108
+#define SCOREBOARD_LINE_10_Y 117
+#define SCOREBOARD_LINE_11_Y 127
+#define SCOREBOARD_LINE_12_Y 137
+#define SCOREBOARD_LINE_13_Y 146
+#define SCOREBOARD_LINE_14_Y 156
+#define SCOREBOARD_LINE_15_Y 166
+#define SCOREBOARD_LINE_16_Y 175
+#define SCOREBOARD_LINE_17_Y 185
+#define SCOREBOARD_LINE_18_Y 195
+#define SCOREBOARD_LINE_19_Y 204
+#define SCOREBOARD_LINE_20_Y 214
+#define SCOREBOARD_LINE_21_Y 224
+#define SCOREBOARD_LINE_22_Y 233
+#define SCOREBOARD_LINE_23_Y 243
+#define SCOREBOARD_LINE_24_Y 253
+#define SCOREBOARD_LINE_25_Y 263
+#define SCOREBOARD_LINE_26_Y 273
+
+#define SCOREBOARD_LINE_BACKGROUND_COLOR 			            .0 .0 .0 .1
+#define SCOREBOARD_LINE_BACKGROUND_COLOR_HIGHLIGHTED 			.2 .2 .2 .7
+
+/*
+type
+0 = nothink
+1 = player line - odd
+2 = player line - even
+3 = player line - highlighted
+
+added _ means that line can be clicked
+
+*/
+
+#define ITEM_SCOREBOARD_LINE(line_id, x, y, y_offset) \
+itemDef  \
+{ \
+	style			WINDOW_STYLE_FILLED \
+	rect			10 y_offset 380 10 0 0 \
+	origin			x y \
+	backcolor		SCOREBOARD_LINE_BACKGROUND_COLOR \
+	visible			1 \
+	dvartest		"ui_scoreboard_line_" line_id \
+	showDvar		{ "2";"2_" } \
+	decoration \
+} \
+itemDef  \
+{ \
+	style			WINDOW_STYLE_FILLED \
+	rect			10 y_offset 380 10 0 0 \
+	origin			x y \
+	backcolor		SCOREBOARD_LINE_BACKGROUND_COLOR_HIGHLIGHTED \
+	visible			1 \
+	dvartest		"ui_scoreboard_line_" line_id \
+	showDvar		{ "3";"3_" } \
+	decoration \
+}		 \
+itemDef \
+{ \
+	rect			SCOREBOARD_HEADING_X y_offset 1 1 0 0 \
+	origin			x y \
+	dvar 			"ui_scoreboard_line_" line_id \
+	textfont		UI_FONT_BIG \
+	textscale		0.32 \
+	textstyle		ITEM_TEXTSTYLE_SHADOWED \
+	textaligny		SCOREBOARD_HEADING_ALIGNY \
+	visible			1 \
+	dvartest		"ui_scoreboard_line_" line_id \
+	hideDvar		{ ""; "0"; "1"; "2"; "3"; "0_"; "1_"; "2_"; "3_"; } \
+	decoration \
+} \
+\
+itemDef  \
+{ \
+	style			WINDOW_STYLE_FILLED \
+	rect			10 y_offset 16 10 0 0 \
+        origin			x y \
+	backcolor		0 0 0 0.7 \
+	visible			1 \
+	dvartest		"ui_scoreboard_line_" line_id \
+        showDvar		{ "0_"; "1_"; "2_"; "3_"; } \
+	decoration \
+}  \
+itemDef \
+{ \
+	rect			0 y_offset 390 10 0 0 \
+        origin			x y \
+	type			ITEM_TYPE_BUTTON \
+	visible			1 \
+	forecolor		1 1 1 1 \
+	text			"Set" \
+	textfont		UI_FONT_NORMAL \
+	textscale		0.18 \
+	textalign		ITEM_ALIGN_LEFT \
+	textalignx		13 \
+	textaligny		8 \
+	textstyle		ITEM_TEXTSTYLE_SHADOWED \
+	dvartest		"ui_scoreboard_line_" line_id \
+        showDvar		{ "0_"; "1_"; "2_"; "3_"; } \
+	action \
+	{ \
+		play "mouse_click"; \
+		exec "openscriptmenu ingame scoreboard_setPlayer" line_id \
+	} \
+	onFocus \
+	{ \
+		play "mouse_over"; \
+	} \
+}
+
+#define ITEM_SCOREBOARD_HEADING(x, y, textstring, x_offset, y_offset, fontsize, txtalign, line_x, line_y, line_height) \
+itemDef \
+{ \
+	rect			x_offset y_offset 1 1 0 0 \
+	origin			x y \
+	type			ITEM_TYPE_TEXT \
+	visible			1 \
+	forecolor		1 1 1 1 \
+	text			textstring \
+	textfont		UI_FONT_NORMAL \
+	textscale		fontsize \
+	textalign		txtalign \
+	textstyle		ITEM_TEXTSTYLE_SHADOWED \
+	dvartest		"ui_scoreboard_visible" \
+	showDvar		{ "1"; } \
+	decoration \
+}  \
+itemDef \
+{ \
+	style			WINDOW_STYLE_FILLED \
+	rect			line_x line_y 0.75 line_height 0 0 \
+        origin			x y \
+	backcolor		1 1 1 .1 \
+	visible			1 \
+	dvartest		"ui_scoreboard_visible" \
+	showDvar		{ "1"; } \
+	decoration \
+}
+
+
+#define ITEM_SCOREBOARD_COLUMN(x, y, cvar, x_offset, y_offset, fontsize, txtalign) \
+itemDef \
+{ \
+	rect			x_offset y_offset 200 50 0 0 \
+	origin			x y \
+	type			ITEM_TYPE_TEXT \
+	visible			1 \
+	forecolor		1 1 1 1 \
+	textfont		UI_FONT_NORMAL \
+	textscale		fontsize \
+	textalign		txtalign \
+	textstyle		ITEM_TEXTSTYLE_SHADOWED \
+	dvar			cvar \
+	decoration \
+}
+
+
+#define ITEM_SCOREBOARD(x, y) \
+\
+	ITEM_SCOREBOARD_HEADING(x, y, "Score",    SCOREBOARD_SCORE_TEXT_X,   	23, .21, ITEM_ALIGN_CENTER, 	SCOREBOARD_SCORE_TEXT_X, 	25, 	30) \
+	ITEM_SCOREBOARD_HEADING(x, y, "Kills",    SCOREBOARD_KILLS_TEXT_X,   	23, .21, ITEM_ALIGN_CENTER, 	SCOREBOARD_KILLS_TEXT_X, 	25, 	30) \
+	ITEM_SCOREBOARD_HEADING(x, y, "Deaths",   SCOREBOARD_DEATHS_TEXT_X,  	33, .21, ITEM_ALIGN_CENTER, 	SCOREBOARD_DEATHS_TEXT_X, 	35, 	20) \
+	ITEM_SCOREBOARD_HEADING(x, y, "Assists",  SCOREBOARD_ASSISTS_TEXT_X, 	23, .21, ITEM_ALIGN_CENTER, 	SCOREBOARD_ASSISTS_TEXT_X, 	25, 	30) \
+	ITEM_SCOREBOARD_HEADING(x, y, "Hits",     SCOREBOARD_DAMAGE_TEXT_X,  	33, .21, ITEM_ALIGN_CENTER, 	SCOREBOARD_DAMAGE_TEXT_X, 	35, 	20) \
+	ITEM_SCOREBOARD_HEADING(x, y, "Grenades", SCOREBOARD_GRENADES_TEXT_X,	23, .21, ITEM_ALIGN_CENTER, 	SCOREBOARD_GRENADES_TEXT_X, 	25, 	30) \
+	ITEM_SCOREBOARD_HEADING(x, y, "Plants",   SCOREBOARD_PLANTS_TEXT_X,  	33, .21, ITEM_ALIGN_CENTER, 	SCOREBOARD_PLANTS_TEXT_X, 	35, 	20) \
+	ITEM_SCOREBOARD_HEADING(x, y, "Defuses",  SCOREBOARD_DEFUSES_TEXT_X, 	23, .21, ITEM_ALIGN_RIGHT,  	SCOREBOARD_DEFUSES_TEXT_X_LINE, 25, 	30) \
+\
+	ITEM_SCOREBOARD_LINE("1", x, y, SCOREBOARD_LINE_1_Y) \
+\
+	ITEM_SCOREBOARD_LINE("4", x, y, SCOREBOARD_LINE_4_Y) \
+	ITEM_SCOREBOARD_LINE("5", x, y, SCOREBOARD_LINE_5_Y) \
+	ITEM_SCOREBOARD_LINE("6", x, y, SCOREBOARD_LINE_6_Y) \
+	ITEM_SCOREBOARD_LINE("7", x, y, SCOREBOARD_LINE_7_Y) \
+	ITEM_SCOREBOARD_LINE("8", x, y, SCOREBOARD_LINE_8_Y) \
+	ITEM_SCOREBOARD_LINE("9", x, y, SCOREBOARD_LINE_9_Y) \
+	ITEM_SCOREBOARD_LINE("10", x, y, SCOREBOARD_LINE_10_Y) \
+	ITEM_SCOREBOARD_LINE("11", x, y, SCOREBOARD_LINE_11_Y) \
+	ITEM_SCOREBOARD_LINE("12", x, y, SCOREBOARD_LINE_12_Y) \
+	ITEM_SCOREBOARD_LINE("13", x, y, SCOREBOARD_LINE_13_Y) \
+	ITEM_SCOREBOARD_LINE("14", x, y, SCOREBOARD_LINE_14_Y) \
+	ITEM_SCOREBOARD_LINE("15", x, y, SCOREBOARD_LINE_15_Y) \
+	ITEM_SCOREBOARD_LINE("16", x, y, SCOREBOARD_LINE_16_Y) \
+	ITEM_SCOREBOARD_LINE("17", x, y, SCOREBOARD_LINE_17_Y) \
+	ITEM_SCOREBOARD_LINE("18", x, y, SCOREBOARD_LINE_18_Y) \
+	ITEM_SCOREBOARD_LINE("19", x, y, SCOREBOARD_LINE_19_Y) \
+	ITEM_SCOREBOARD_LINE("20", x, y, SCOREBOARD_LINE_20_Y) \
+	ITEM_SCOREBOARD_LINE("21", x, y, SCOREBOARD_LINE_21_Y) \
+	ITEM_SCOREBOARD_LINE("22", x, y, SCOREBOARD_LINE_22_Y) \
+	ITEM_SCOREBOARD_LINE("23", x, y, SCOREBOARD_LINE_23_Y) \
+	ITEM_SCOREBOARD_LINE("24", x, y, SCOREBOARD_LINE_24_Y) \
+	ITEM_SCOREBOARD_LINE("25", x, y, SCOREBOARD_LINE_25_Y) \
+	ITEM_SCOREBOARD_LINE("26", x, y, SCOREBOARD_LINE_26_Y) \
+\
+	ITEM_SCOREBOARD_COLUMN(x, y, "ui_scoreboard_names",    SCOREBOARD_NAME_X,     40, .2, ITEM_ALIGN_LEFT) \
+	ITEM_SCOREBOARD_COLUMN(x, y, "ui_scoreboard_scores",   SCOREBOARD_SCORE_X,    40, .2, ITEM_ALIGN_LEFT) \
+	ITEM_SCOREBOARD_COLUMN(x, y, "ui_scoreboard_kills",    SCOREBOARD_KILLS_X,    40, .2, ITEM_ALIGN_LEFT) \
+	ITEM_SCOREBOARD_COLUMN(x, y, "ui_scoreboard_deaths",   SCOREBOARD_DEATHS_X,   40, .2, ITEM_ALIGN_LEFT) \
+	ITEM_SCOREBOARD_COLUMN(x, y, "ui_scoreboard_assists",  SCOREBOARD_ASSISTS_X,  40, .2, ITEM_ALIGN_LEFT) \
+	ITEM_SCOREBOARD_COLUMN(x, y, "ui_scoreboard_damages",  SCOREBOARD_DAMAGE_X,   40, .2, ITEM_ALIGN_LEFT) \
+	ITEM_SCOREBOARD_COLUMN(x, y, "ui_scoreboard_grenades", SCOREBOARD_GRENADES_X, 40, .2, ITEM_ALIGN_LEFT) \
+	ITEM_SCOREBOARD_COLUMN(x, y, "ui_scoreboard_plants",   SCOREBOARD_PLANTS_X,   40, .2, ITEM_ALIGN_LEFT) \
+	ITEM_SCOREBOARD_COLUMN(x, y, "ui_scoreboard_defuses",  SCOREBOARD_DEFUSES_X,  40, .2, ITEM_ALIGN_LEFT) \
+	ITEM_SCOREBOARD_COLUMN(x, y, "ui_scoreboard_ping",     SCOREBOARD_PING_X,     40, .2, ITEM_ALIGN_LEFT)
+
+
+
+
+
+
+
+
 // All sub-menus that can be possibly opened at the same time
 #define CLOSE_SUBMENUS close ingame_keys; close team_britishgerman_keys; close team_americangerman_keys; close team_russiangerman_keys; close ingame_scoreboard_sd; close rcon_map; close rcon_map_maps; close rcon_map_pams; close rcon_map_other; close rcon_map_apply; close rcon_settings; close rcon_settings_shared; close rcon_settings_gametypes; close rcon_settings_focus; close rcon_kick; close aboutpam; close pammodes;
 #define CLOSE_ALL CLOSE_SUBMENUS close ingame; close team_britishgerman; close team_americangerman; close team_russiangerman;
diff --git a/source/ui_mp/scriptmenus/debugString.menu b/source/ui_mp/scriptmenus/debugString.menu
index 35afe95..7e66d47 100644
--- a/source/ui_mp/scriptmenus/debugString.menu
+++ b/source/ui_mp/scriptmenus/debugString.menu
@@ -28,6 +28,13 @@
 		execKeyInt 32 { play "mouse_click"; exec "toggle cl_bypassMouseInput 0 1" } // space
 
 
+		//execKeyInt 200 { play "mouse_click"; exec "say mouse1" } // left mouse
+		//execKeyInt 201 { play "mouse_click"; exec "say mouse2" } // right mouse
+		execKeyInt 202 { play "mouse_click"; exec "set debug_text all" } // middle
+
+		//execKeyInt 160 { play "mouse_click"; exec "say shift" } // shift
+		//execKeyInt 159 { play "mouse_click"; exec "say ctrl" } // ctrl
+		//execKeyInt 158 { play "mouse_click"; exec "say mouse3" } // alt
 
 
 		itemDef
@@ -39,6 +46,38 @@
 			decoration
 		}
 
+		itemDef
+		{
+			style			WINDOW_STYLE_FILLED
+			rect			0 0 50 50 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
+			backcolor		0.045 .05 0.053 .65
+			visible			1
+			//decoration
+			execKeyInt 202 { play "mouse_click"; exec "set debug_text box_left" } // middle
+		}
+
+		itemDef
+		{
+			style			WINDOW_STYLE_FILLED
+			rect			-50 0 50 50 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP
+			backcolor		0.045 .05 0.053 .65
+			visible			1
+			//decoration
+			execKeyInt 202 { play "mouse_click"; exec "set debug_text box_right" } // middle
+		}
+
+		itemDef
+		{
+			name			"text_0"
+			visible			1
+			origin			20 5
+			forecolor		1 1 1 1
+			dvar			"debug_text"
+			textfont		UI_FONT_CONSOLE
+			textscale		0.25
+			textstyle		ITEM_TEXTSTYLE_SHADOWED
+			textaligny		16
+		}
 
 		itemDef
 		{
diff --git a/source/ui_mp/scriptmenus/ingame.menu b/source/ui_mp/scriptmenus/ingame.menu
index a8374f6..83a3a6e 100644
--- a/source/ui_mp/scriptmenus/ingame.menu
+++ b/source/ui_mp/scriptmenus/ingame.menu
@@ -14,6 +14,9 @@
 			close matchinfo;
 			close ingame_scoreboard_sd;
 
+			// Make sure cursor is enable (in case of spectator menu fails)
+			setDvar cl_bypassMouseInput "0" // enable cursor movement
+
 			uiScript openMenuOnDvar ui_matchinfo_show "1" matchinfo;
 			uiScript openMenuOnDvar ui_scoreboard_show "sd" ingame_scoreboard_sd;
 			open ingame_keys;
@@ -189,6 +192,11 @@
 		focuscolor		GLOBAL_FOCUSED_COLOR
 		style			WINDOW_STYLE_EMPTY
 
+		onOpen
+		{
+			exec "openscriptmenu ingame scoreboard_refresh";	// this will update info
+		}
+
 		itemDef
 		{
 			style			WINDOW_STYLE_FILLED
@@ -235,7 +243,7 @@
 		ITEM_TEXT("Score:     Kill +1   |   Teamkill -1   |   Assist plant defuse +0.5",  9, 311, .20, ITEM_ALIGN_LEFT, 1 1 1 .25)
 		ITEM_TEXT("Hits:         Scope/Rifle +1   |   Semi/Automatic/Shotgun +0.5",  9, 322, .20, ITEM_ALIGN_LEFT, 1 1 1 .25)
 
-		#include "ui_mp/scriptmenus/submenus/scoreboard_lines_sd.menu"
+		ITEM_SCOREBOARD(0, 0)
 	}
 
 
diff --git a/source/ui_mp/scriptmenus/language.menu b/source/ui_mp/scriptmenus/language.menu
deleted file mode 100644
index a3da2e0..0000000
--- a/source/ui_mp/scriptmenus/language.menu
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "ui_mp/menudef.h"
-#include "ui_mp/macros.h"
-
-{
-	menuDef
-	{
-		name			"language"
-		rect			0 0 640 480
-		focuscolor		GLOBAL_FOCUSED_COLOR
-		style			WINDOW_STYLE_EMPTY
-		blurWorld		5.0
-		onOpen
-		{
-			execOnDvarStringValue loc_language 0 "openscriptmenu language 0"; // English
-			execOnDvarStringValue loc_language 1 "openscriptmenu language 1"; // French
-			execOnDvarStringValue loc_language 2 "openscriptmenu language 2"; // German
-			execOnDvarStringValue loc_language 6 "openscriptmenu language 6"; // Russian
-			execOnDvarStringValue loc_language 7 "openscriptmenu language 7"; // Polish
-			execOnDvarStringValue loc_language 14 "openscriptmenu language 14"; // Czech
-			execOnDvarStringValue loc_language 15 "openscriptmenu language 15"; // Czech
-
-			// Only 1 openscriptmenu command can be send from client
-			// If none of the conditions above did not match, use default
-			exec "openscriptmenu language -1"; // Default
-		}
-
-		// Background
-		DRAW_MAP_BACKGROUND_IF_BLACKOUT
-		DRAW_BLUISH_BACKGROUND
-		DRAW_GRADIENT_LEFT_TO_RIGHT
-		DRAW_BARS
-
-		//
-		ITEM_TEXT_HEADING("Loading...")
-
-
-		// Close menu
-		ITEM_BAR_BOTTOM_BUTTON("^9[ESC]^7 Close",	40, 90, ;)
-		// Main menu
-		ITEM_BAR_BOTTOM_BUTTON("^9[SPACE]^7 Main Menu", 140, 120, ;)
-	}
-}
diff --git a/source/ui_mp/scriptmenus/scoreboard_sd.menu b/source/ui_mp/scriptmenus/scoreboard_sd.menu
index 1b60fca..44538c0 100644
--- a/source/ui_mp/scriptmenus/scoreboard_sd.menu
+++ b/source/ui_mp/scriptmenus/scoreboard_sd.menu
@@ -120,8 +120,12 @@
 		style			WINDOW_STYLE_EMPTY
 		blurWorld		0
 
-    		#include "ui_mp/scriptmenus/submenus/scoreboard_lines_sd.menu"
+		onOpen
+		{
+			exec "openscriptmenu ingame scoreboard_refresh";	// this will update info
+		}
 
+		ITEM_SCOREBOARD(0, 0)
 
 		itemDef
 		{
diff --git a/source/ui_mp/scriptmenus/spectatingsystem.menu b/source/ui_mp/scriptmenus/spectatingsystem.menu
index c5a5166..57d06d0 100644
--- a/source/ui_mp/scriptmenus/spectatingsystem.menu
+++ b/source/ui_mp/scriptmenus/spectatingsystem.menu
@@ -1,48 +1,8 @@
-onOpen
+// Menu just to allow command /openScriptMenu to use spectatingsystem as menu name
+menuDef
 {
-	setDvar cl_bypassMouseInput "1"
-
-	exec "openscriptmenu spectatingsystem menu_open";
+  	name			spectatingsystem
+	rect			0 0 1 1
+	style			0
+	fullscreen		1
 }
-onClose
-{
-	setDvar cl_bypassMouseInput "0"
-}
-onEsc
-{
-	exec "openscriptmenu spectatingsystem menu_close";
-	close quickmessage_spectatingsystem_menu; close quickmessage;
-}
-
-itemDef
-{
-	name			"window_background"
-	visible			1
-	rect			160 250 200 170
-	origin			0 0
-	style			WINDOW_STYLE_FILLED
-	forecolor		1 1 1 1
-	backcolor		0 0 0 0.7975
-	decoration
-}
-
-ITEM_TEXT("Actions to replay:", 170, 270, 0.25, ITEM_ALIGN_LEFT, 1 1 1 1)
-
-ITEM_DVAR("ui_spectatorsystem_menu_text", 170, 285, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-
-ITEM_TEXT("(only 40 seconds of history can be saved)", 170, 405, 0.18, ITEM_ALIGN_LEFT, 1 1 1 0.5)
-
-ITEM_TEXT("@QUICKMESSAGE_ESC_EXIT", 170, 415, 0.2, ITEM_ALIGN_LEFT, 1 1 1 1)
-
-
-
-execKey "1" { close quickmessage_spectatingsystem_menu; close quickmessage; exec "openscriptmenu spectatingsystem killcam_1" }
-execKey "2" { close quickmessage_spectatingsystem_menu; close quickmessage; exec "openscriptmenu spectatingsystem killcam_2" }
-execKey "3" { close quickmessage_spectatingsystem_menu; close quickmessage; exec "openscriptmenu spectatingsystem killcam_3" }
-execKey "4" { close quickmessage_spectatingsystem_menu; close quickmessage; exec "openscriptmenu spectatingsystem killcam_4" }
-execKey "5" { close quickmessage_spectatingsystem_menu; close quickmessage; exec "openscriptmenu spectatingsystem killcam_5" }
-execKey "6" { close quickmessage_spectatingsystem_menu; close quickmessage; exec "openscriptmenu spectatingsystem killcam_6" }
-execKey "7" { close quickmessage_spectatingsystem_menu; close quickmessage; exec "openscriptmenu spectatingsystem killcam_7" }
-execKey "8" { close quickmessage_spectatingsystem_menu; close quickmessage; exec "openscriptmenu spectatingsystem killcam_8" }
-execKey "9" { close quickmessage_spectatingsystem_menu; close quickmessage; exec "openscriptmenu spectatingsystem killcam_9" }
-execKey "0" { close quickmessage_spectatingsystem_menu; close quickmessage; exec "openscriptmenu spectatingsystem killcam_10" }
diff --git a/source/ui_mp/scriptmenus/submenus/ingame_rcon_kick.menu b/source/ui_mp/scriptmenus/submenus/ingame_rcon_kick.menu
index 353207e..ac8fe14 100644
--- a/source/ui_mp/scriptmenus/submenus/ingame_rcon_kick.menu
+++ b/source/ui_mp/scriptmenus/submenus/ingame_rcon_kick.menu
@@ -8,9 +8,9 @@ onOpen
 #define PLAYERLIST_X	0
 
 #define PLAYERLIST_W	350
-#define PLAYERLIST_H	19
+#define PLAYERLIST_H	15
 
-#define PLAYERLIST_TEXT_ALIGNY 15
+#define PLAYERLIST_TEXT_ALIGNY 13
 
 #define PLAYERLIST_NAME_X 10
 #define PLAYERLIST_KICK_X 270
@@ -18,21 +18,27 @@ onOpen
 
 
 #define PLAYERLIST_LINE_1_Y 0
-#define PLAYERLIST_LINE_2_Y 20
-#define PLAYERLIST_LINE_3_Y 40
-#define PLAYERLIST_LINE_4_Y 60
-#define PLAYERLIST_LINE_5_Y 80
-#define PLAYERLIST_LINE_6_Y 100
-#define PLAYERLIST_LINE_7_Y 120
-#define PLAYERLIST_LINE_8_Y 140
-#define PLAYERLIST_LINE_9_Y 160
-#define PLAYERLIST_LINE_10_Y 180
-#define PLAYERLIST_LINE_11_Y 200
-#define PLAYERLIST_LINE_12_Y 220
-#define PLAYERLIST_LINE_13_Y 240
-#define PLAYERLIST_LINE_14_Y 260
-#define PLAYERLIST_LINE_15_Y 280
-#define PLAYERLIST_LINE_16_Y 300
+#define PLAYERLIST_LINE_2_Y 16
+#define PLAYERLIST_LINE_3_Y 32
+#define PLAYERLIST_LINE_4_Y 48
+#define PLAYERLIST_LINE_5_Y 64
+#define PLAYERLIST_LINE_6_Y 80
+#define PLAYERLIST_LINE_7_Y 96
+#define PLAYERLIST_LINE_8_Y 112
+#define PLAYERLIST_LINE_9_Y 128
+#define PLAYERLIST_LINE_10_Y 144
+#define PLAYERLIST_LINE_11_Y 160
+#define PLAYERLIST_LINE_12_Y 176
+#define PLAYERLIST_LINE_13_Y 192
+#define PLAYERLIST_LINE_14_Y 208
+#define PLAYERLIST_LINE_15_Y 224
+#define PLAYERLIST_LINE_16_Y 240
+#define PLAYERLIST_LINE_17_Y 256
+#define PLAYERLIST_LINE_18_Y 272
+#define PLAYERLIST_LINE_19_Y 288
+#define PLAYERLIST_LINE_20_Y 304
+#define PLAYERLIST_LINE_21_Y 320
+#define PLAYERLIST_LINE_22_Y 336
 
 #define PLAYERLIST_ALLIES_BACKGROUND_COLOR 			0.24 0.42 0.8 0.2
 #define PLAYERLIST_AXIS_BACKGROUND_COLOR 			0.8 0.24 0.24 0.2
@@ -54,7 +60,7 @@ itemDef  \
 	rect			PLAYERLIST_X y_offset PLAYERLIST_W PLAYERLIST_H 0 0 \
 	backcolor		PLAYERLIST_ALLIES_BACKGROUND_COLOR \
 	visible			1 \
-	dvartest		"ui_playerlist_line_" #line_id "_team" \
+	dvartest		"ui_rcon_kick_line_" line_id "_team" \
 	showDvar		{ "1" } \
 	decoration \
 } \
@@ -64,7 +70,7 @@ itemDef  \
 	rect			PLAYERLIST_X y_offset PLAYERLIST_W PLAYERLIST_H 0 0 \
 	backcolor		PLAYERLIST_AXIS_BACKGROUND_COLOR \
 	visible			1 \
-	dvartest		"ui_playerlist_line_" #line_id "_team" \
+	dvartest		"ui_rcon_kick_line_" line_id "_team" \
 	showDvar		{ "2" } \
 	decoration \
 }		 \
@@ -74,7 +80,7 @@ itemDef  \
 	rect			PLAYERLIST_X y_offset PLAYERLIST_W PLAYERLIST_H 0 0 \
 	backcolor		PLAYERLIST_NEUTRAL_BACKGROUND_COLOR \
 	visible			1 \
-	dvartest		"ui_playerlist_line_" #line_id "_team" \
+	dvartest		"ui_rcon_kick_line_" line_id "_team" \
 	showDvar		{ "3" } \
 	decoration \
 }	 \
@@ -84,7 +90,7 @@ itemDef  \
 	rect			PLAYERLIST_X y_offset PLAYERLIST_W PLAYERLIST_H 0 0 \
 	backcolor		PLAYERLIST_HEADING_BACKGROUND_COLOR \
 	visible			1 \
-	dvartest		"ui_playerlist_line_" #line_id "_team" \
+	dvartest		"ui_rcon_kick_line_" line_id "_team" \
 	showDvar		{ "4" } \
 	decoration \
 }	 \
@@ -92,14 +98,14 @@ itemDef  \
  \
 itemDef \
 { \
-	dvar 			"ui_playerlist_line_" #line_id "_name" \
+	dvar 			"ui_rcon_kick_line_" line_id "_name" \
 	textfont		UI_FONT_BIG \
 	textscale		0.25 \
 	textstyle		ITEM_TEXTSTYLE_SHADOWED \
 	textaligny		PLAYERLIST_TEXT_ALIGNY \
 	visible			1 \
 	origin			PLAYERLIST_NAME_X y_offset \
-	dvartest		"ui_playerlist_line_" #line_id "_team" \
+	dvartest		"ui_rcon_kick_line_" line_id "_team" \
 	hideDvar		{ ""; "0" } \
 	decoration \
 } \
@@ -108,15 +114,15 @@ itemDef  \
 { \
 	text			"Kick player" \
 	visible			1 \
-	rect			0 0 60 18 0 0 \
+	rect			0 0 60 PLAYERLIST_H 0 0 \
 	origin			PLAYERLIST_KICK_X y_offset \
 	forecolor		GLOBAL_UNFOCUSED_COLOR \
 	type			ITEM_TYPE_BUTTON \
 	textfont		UI_FONT_NORMAL \
-	textscale		0.25 \
+	textscale		0.22 \
 	textstyle		ITEM_TEXTSTYLE_SHADOWED \
 	textaligny		PLAYERLIST_TEXT_ALIGNY \
-	dvartest		"ui_playerlist_line_" #line_id "_team" \
+	dvartest		"ui_rcon_kick_line_" line_id "_team" \
 	showDvar		{ "1"; "2"; "3" } \
 	onFocus \
 	{ \
@@ -126,22 +132,22 @@ itemDef  \
 	action \
 	{ \
 		play "mouse_click"; \
-		exec "vstr ui_playerlist_line_" #line_id "_kick"; \
+		exec "vstr ui_rcon_kick_line_" line_id "_kick"; \
 	} \
 } \
 itemDef  \
 { \
 	text			"Ban" \
 	visible			1 \
-	rect			0 0 30 18 0 0 \
+	rect			0 0 30 PLAYERLIST_H 0 0 \
 	origin			PLAYERLIST_BAN_X y_offset \
 	forecolor		GLOBAL_UNFOCUSED_COLOR \
 	type			ITEM_TYPE_BUTTON \
 	textfont		UI_FONT_NORMAL \
-	textscale		0.25 \
+	textscale		0.22 \
 	textstyle		ITEM_TEXTSTYLE_SHADOWED \
 	textaligny		PLAYERLIST_TEXT_ALIGNY \
-	dvartest		"ui_playerlist_line_" #line_id "_team" \
+	dvartest		"ui_rcon_kick_line_" line_id "_team" \
 	showDvar		{ "1"; "2"; "3" } \
 	onFocus \
 	{ \
@@ -151,27 +157,33 @@ itemDef  \
 	action \
 	{ \
 		play "mouse_click"; \
-		exec "vstr ui_playerlist_line_" #line_id "_ban"; \
+		exec "vstr ui_rcon_kick_line_" line_id "_ban"; \
 	} \
 }
 
 
-ITEM_PLAYERLIST_LINE(1, PLAYERLIST_LINE_1_Y)
-ITEM_PLAYERLIST_LINE(2, PLAYERLIST_LINE_2_Y)
-ITEM_PLAYERLIST_LINE(3, PLAYERLIST_LINE_3_Y)
-ITEM_PLAYERLIST_LINE(4, PLAYERLIST_LINE_4_Y)
-ITEM_PLAYERLIST_LINE(5, PLAYERLIST_LINE_5_Y)
-ITEM_PLAYERLIST_LINE(6, PLAYERLIST_LINE_6_Y)
-ITEM_PLAYERLIST_LINE(7, PLAYERLIST_LINE_7_Y)
-ITEM_PLAYERLIST_LINE(8, PLAYERLIST_LINE_8_Y)
-ITEM_PLAYERLIST_LINE(9, PLAYERLIST_LINE_9_Y)
-ITEM_PLAYERLIST_LINE(10, PLAYERLIST_LINE_10_Y)
-ITEM_PLAYERLIST_LINE(11, PLAYERLIST_LINE_11_Y)
-ITEM_PLAYERLIST_LINE(12, PLAYERLIST_LINE_12_Y)
-ITEM_PLAYERLIST_LINE(13, PLAYERLIST_LINE_13_Y)
-ITEM_PLAYERLIST_LINE(14, PLAYERLIST_LINE_14_Y)
-ITEM_PLAYERLIST_LINE(15, PLAYERLIST_LINE_15_Y)
-ITEM_PLAYERLIST_LINE(16, PLAYERLIST_LINE_16_Y)
+ITEM_PLAYERLIST_LINE("1", PLAYERLIST_LINE_1_Y)
+ITEM_PLAYERLIST_LINE("2", PLAYERLIST_LINE_2_Y)
+ITEM_PLAYERLIST_LINE("3", PLAYERLIST_LINE_3_Y)
+ITEM_PLAYERLIST_LINE("4", PLAYERLIST_LINE_4_Y)
+ITEM_PLAYERLIST_LINE("5", PLAYERLIST_LINE_5_Y)
+ITEM_PLAYERLIST_LINE("6", PLAYERLIST_LINE_6_Y)
+ITEM_PLAYERLIST_LINE("7", PLAYERLIST_LINE_7_Y)
+ITEM_PLAYERLIST_LINE("8", PLAYERLIST_LINE_8_Y)
+ITEM_PLAYERLIST_LINE("9", PLAYERLIST_LINE_9_Y)
+ITEM_PLAYERLIST_LINE("10", PLAYERLIST_LINE_10_Y)
+ITEM_PLAYERLIST_LINE("11", PLAYERLIST_LINE_11_Y)
+ITEM_PLAYERLIST_LINE("12", PLAYERLIST_LINE_12_Y)
+ITEM_PLAYERLIST_LINE("13", PLAYERLIST_LINE_13_Y)
+ITEM_PLAYERLIST_LINE("14", PLAYERLIST_LINE_14_Y)
+ITEM_PLAYERLIST_LINE("15", PLAYERLIST_LINE_15_Y)
+ITEM_PLAYERLIST_LINE("16", PLAYERLIST_LINE_16_Y)
+ITEM_PLAYERLIST_LINE("17", PLAYERLIST_LINE_17_Y)
+ITEM_PLAYERLIST_LINE("18", PLAYERLIST_LINE_18_Y)
+ITEM_PLAYERLIST_LINE("19", PLAYERLIST_LINE_19_Y)
+ITEM_PLAYERLIST_LINE("20", PLAYERLIST_LINE_20_Y)
+ITEM_PLAYERLIST_LINE("21", PLAYERLIST_LINE_21_Y)
+ITEM_PLAYERLIST_LINE("22", PLAYERLIST_LINE_22_Y)
 
 
 itemDef
diff --git a/source/ui_mp/scriptmenus/submenus/matchinfo_hud.menu b/source/ui_mp/scriptmenus/submenus/matchinfo_hud.menu
index 7162e5b..cebb700 100644
--- a/source/ui_mp/scriptmenus/submenus/matchinfo_hud.menu
+++ b/source/ui_mp/scriptmenus/submenus/matchinfo_hud.menu
@@ -1,31 +1,31 @@
 // Team color bg
-MATCHINFO_BGCOLOR(-131 0 130 15, 0.3 0 0 .6, "ui_matchinfo_ingame_team1_sideColor", showDvar { "1" }) // Red
-MATCHINFO_BGCOLOR(-131 0 130 15, .0 0.4 .0 .6, "ui_matchinfo_ingame_team1_sideColor", showDvar { "2" }) // Green
-MATCHINFO_BGCOLOR(-131 0 130 15, 0.3 0.3 0.9 .7, "ui_matchinfo_ingame_team1_sideColor", showDvar { "3" }) // Blue
-MATCHINFO_BGCOLOR(-131 0 130 15, .3 .3 .3 .7, "ui_matchinfo_ingame_team1_sideColor", showDvar { "4" }) // Gray
+MATCHINFO_BGCOLOR(-131 0 130 15, 0.7 0 0 .6, 		"ui_matchinfo_ingame_team1_color", showDvar { "1" }) // Red
+MATCHINFO_BGCOLOR(-131 0 130 15, .0 0.4 .0 .6, 		"ui_matchinfo_ingame_team1_color", showDvar { "2" }) // Green
+MATCHINFO_BGCOLOR(-131 0 130 15, 0.3 0.3 0.9 .7, 	"ui_matchinfo_ingame_team1_color", showDvar { "3" }) // Blue
+MATCHINFO_BGCOLOR(-131 0 130 15, .3 .3 .3 .7, 		"ui_matchinfo_ingame_team1_color", showDvar { "4" }) // Gray
 // Team background
-MATCHINFO_BGCOLOR(-131 0 130 14, .1 .1 .1 .6, "ui_matchinfo_ingame_team1_sideColor", showDvar { "1"; "2"; "3"; "4" })
+MATCHINFO_BGCOLOR(-131 0 130 14, .1 .1 .1 .6, 		"ui_matchinfo_ingame_team1_color", showDvar { "1"; "2"; "3"; "4" })
 // Icon
-MATCHINFO_ICON(-128 1, "hudicon_russian", "ui_matchinfo_ingame_team1_sideColor", showDvar { "1" } )
-MATCHINFO_ICON(-128 1, "hudicon_american", "ui_matchinfo_ingame_team1_sideColor", showDvar { "2" } )
-MATCHINFO_ICON(-128 1, "hudicon_british", "ui_matchinfo_ingame_team1_sideColor", showDvar { "3" } )
-MATCHINFO_ICON(-128 1, "hudicon_german", "ui_matchinfo_ingame_team1_sideColor", showDvar { "4" } )
+MATCHINFO_ICON(-128 1, "hudicon_russian", 		"ui_matchinfo_ingame_team1_team", showDvar { "russian" } )
+MATCHINFO_ICON(-128 1, "hudicon_american", 		"ui_matchinfo_ingame_team1_team", showDvar { "american" } )
+MATCHINFO_ICON(-128 1, "hudicon_british",		"ui_matchinfo_ingame_team1_team", showDvar { "british" } )
+MATCHINFO_ICON(-128 1, "hudicon_german", 		"ui_matchinfo_ingame_team1_team", showDvar { "german" } )
 
 
 
 
 // Team color bg
-MATCHINFO_BGCOLOR(1 0 130 15, 0.3 0 0 .6, "ui_matchinfo_ingame_team2_sideColor", showDvar { "1" }) // Red
-MATCHINFO_BGCOLOR(1 0 130 15, .0 0.4 .0 .6, "ui_matchinfo_ingame_team2_sideColor", showDvar { "2" }) // Green
-MATCHINFO_BGCOLOR(1 0 130 15, 0.3 0.3 0.9 .7, "ui_matchinfo_ingame_team2_sideColor", showDvar { "3" }) // Blue
-MATCHINFO_BGCOLOR(1 0 130 15, .3 .3 .3 .7, "ui_matchinfo_ingame_team2_sideColor", showDvar { "4" }) // Gray
+MATCHINFO_BGCOLOR(1 0 130 15, 0.7 0 0 .6, 		"ui_matchinfo_ingame_team2_color", showDvar { "1" }) // Red
+MATCHINFO_BGCOLOR(1 0 130 15, .0 0.4 .0 .6, 		"ui_matchinfo_ingame_team2_color", showDvar { "2" }) // Green
+MATCHINFO_BGCOLOR(1 0 130 15, 0.3 0.3 0.9 .7, 		"ui_matchinfo_ingame_team2_color", showDvar { "3" }) // Blue
+MATCHINFO_BGCOLOR(1 0 130 15, .3 .3 .3 .7, 		"ui_matchinfo_ingame_team2_color", showDvar { "4" }) // Gray
 // Team background
-MATCHINFO_BGCOLOR(1 0 130 14, .1 .1 .1 .6, "ui_matchinfo_ingame_team2_sideColor", showDvar { "1"; "2"; "3"; "4" })
+MATCHINFO_BGCOLOR(1 0 130 14, .1 .1 .1 .6, 		"ui_matchinfo_ingame_team2_color", showDvar { "1"; "2"; "3"; "4" })
 // Icon
-MATCHINFO_ICON(3 1, "hudicon_russian", "ui_matchinfo_ingame_team2_sideColor", showDvar { "1" } )
-MATCHINFO_ICON(3 1, "hudicon_american", "ui_matchinfo_ingame_team2_sideColor", showDvar { "2" } )
-MATCHINFO_ICON(3 1, "hudicon_british", "ui_matchinfo_ingame_team2_sideColor", showDvar { "3" } )
-MATCHINFO_ICON(3 1, "hudicon_german", "ui_matchinfo_ingame_team2_sideColor", showDvar { "4" } )
+MATCHINFO_ICON(3 1, "hudicon_russian", 			"ui_matchinfo_ingame_team2_team", showDvar { "russian" } )
+MATCHINFO_ICON(3 1, "hudicon_american", 		"ui_matchinfo_ingame_team2_team", showDvar { "american" } )
+MATCHINFO_ICON(3 1, "hudicon_british", 			"ui_matchinfo_ingame_team2_team", showDvar { "british" } )
+MATCHINFO_ICON(3 1, "hudicon_german", 			"ui_matchinfo_ingame_team2_team", showDvar { "german" } )
 
 
 
diff --git a/source/ui_mp/scriptmenus/submenus/matchinfo_menu.menu b/source/ui_mp/scriptmenus/submenus/matchinfo_menu.menu
index 7cab87e..10b7958 100644
--- a/source/ui_mp/scriptmenus/submenus/matchinfo_menu.menu
+++ b/source/ui_mp/scriptmenus/submenus/matchinfo_menu.menu
@@ -1,31 +1,31 @@
 // Team color bg
-MATCHINFO_BGCOLOR(-131 0 130 15, 0.3 0 0 .8, "ui_matchinfo_team1_sideColor", showDvar { "1" }) // Red
-MATCHINFO_BGCOLOR(-131 0 130 15, .0 0.4 .0 .8, "ui_matchinfo_team1_sideColor", showDvar { "2" }) // Green
-MATCHINFO_BGCOLOR(-131 0 130 15, 0.3 0.3 0.9 .9, "ui_matchinfo_team1_sideColor", showDvar { "3" }) // Blue
-MATCHINFO_BGCOLOR(-131 0 130 15, .3 .3 .3 .9, "ui_matchinfo_team1_sideColor", showDvar { "4" }) // Gray
+MATCHINFO_BGCOLOR(-131 0 130 15, 0.7 0 0 .8, 		"ui_matchinfo_team1_color", showDvar { "1" }) // Red
+MATCHINFO_BGCOLOR(-131 0 130 15, .0 0.4 .0 .8, 		"ui_matchinfo_team1_color", showDvar { "2" }) // Green
+MATCHINFO_BGCOLOR(-131 0 130 15, 0.3 0.3 0.9 .9, 	"ui_matchinfo_team1_color", showDvar { "3" }) // Blue
+MATCHINFO_BGCOLOR(-131 0 130 15, .3 .3 .3 .9, 		"ui_matchinfo_team1_color", showDvar { "4" }) // Gray
 // Team background
-MATCHINFO_BGCOLOR(-131 0 130 14, .1 .1 .1 .8, "ui_matchinfo_team1_sideColor", showDvar { "1"; "2"; "3"; "4" })
+MATCHINFO_BGCOLOR(-131 0 130 14, .1 .1 .1 .8, 		"ui_matchinfo_team1_color", showDvar { "1"; "2"; "3"; "4" })
 // Icon
-MATCHINFO_ICON(-128 1, "hudicon_russian", "ui_matchinfo_team1_sideColor", showDvar { "1" } )
-MATCHINFO_ICON(-128 1, "hudicon_american", "ui_matchinfo_team1_sideColor", showDvar { "2" } )
-MATCHINFO_ICON(-128 1, "hudicon_british", "ui_matchinfo_team1_sideColor", showDvar { "3" } )
-MATCHINFO_ICON(-128 1, "hudicon_german", "ui_matchinfo_team1_sideColor", showDvar { "4" } )
+MATCHINFO_ICON(-128 1, "hudicon_russian", 		"ui_matchinfo_team1_team", showDvar { "russian" } )
+MATCHINFO_ICON(-128 1, "hudicon_american", 		"ui_matchinfo_team1_team", showDvar { "american" } )
+MATCHINFO_ICON(-128 1, "hudicon_british", 		"ui_matchinfo_team1_team", showDvar { "british" } )
+MATCHINFO_ICON(-128 1, "hudicon_german", 		"ui_matchinfo_team1_team", showDvar { "german" } )
 
 
 
 
 // Team color bg
-MATCHINFO_BGCOLOR(1 0 130 15, 0.3 0 0 .8, "ui_matchinfo_team2_sideColor", showDvar { "1" }) // Red
-MATCHINFO_BGCOLOR(1 0 130 15, .0 0.4 .0 .8, "ui_matchinfo_team2_sideColor", showDvar { "2" }) // Green
-MATCHINFO_BGCOLOR(1 0 130 15, 0.3 0.3 0.9 .9, "ui_matchinfo_team2_sideColor", showDvar { "3" }) // Blue
-MATCHINFO_BGCOLOR(1 0 130 15, .3 .3 .3 .9, "ui_matchinfo_team2_sideColor", showDvar { "4" }) // Gray
+MATCHINFO_BGCOLOR(1 0 130 15, 0.7 0 0 .8, 		"ui_matchinfo_team2_color", showDvar { "1" }) // Red
+MATCHINFO_BGCOLOR(1 0 130 15, .0 0.4 .0 .8, 		"ui_matchinfo_team2_color", showDvar { "2" }) // Green
+MATCHINFO_BGCOLOR(1 0 130 15, 0.3 0.3 0.9 .9, 		"ui_matchinfo_team2_color", showDvar { "3" }) // Blue
+MATCHINFO_BGCOLOR(1 0 130 15, .3 .3 .3 .9, 		"ui_matchinfo_team2_color", showDvar { "4" }) // Gray
 // Team background
-MATCHINFO_BGCOLOR(1 0 130 14, .1 .1 .1 .8, "ui_matchinfo_team2_sideColor", showDvar { "1"; "2"; "3"; "4" })
+MATCHINFO_BGCOLOR(1 0 130 14, .1 .1 .1 .8, 		"ui_matchinfo_team2_color", showDvar { "1"; "2"; "3"; "4" })
 // Icon
-MATCHINFO_ICON(3 1, "hudicon_russian", "ui_matchinfo_team2_sideColor", showDvar { "1" } )
-MATCHINFO_ICON(3 1, "hudicon_american", "ui_matchinfo_team2_sideColor", showDvar { "2" } )
-MATCHINFO_ICON(3 1, "hudicon_british", "ui_matchinfo_team2_sideColor", showDvar { "3" } )
-MATCHINFO_ICON(3 1, "hudicon_german", "ui_matchinfo_team2_sideColor", showDvar { "4" } )
+MATCHINFO_ICON(3 1, "hudicon_russian", 			"ui_matchinfo_team2_team", showDvar { "russian" } )
+MATCHINFO_ICON(3 1, "hudicon_american", 		"ui_matchinfo_team2_team", showDvar { "american" } )
+MATCHINFO_ICON(3 1, "hudicon_british", 			"ui_matchinfo_team2_team", showDvar { "british" } )
+MATCHINFO_ICON(3 1, "hudicon_german", 			"ui_matchinfo_team2_team", showDvar { "german" } )
 
 
 
diff --git a/source/ui_mp/scriptmenus/submenus/scoreboard_lines_sd.menu b/source/ui_mp/scriptmenus/submenus/scoreboard_lines_sd.menu
deleted file mode 100644
index c8732ce..0000000
--- a/source/ui_mp/scriptmenus/submenus/scoreboard_lines_sd.menu
+++ /dev/null
@@ -1,217 +0,0 @@
-onOpen
-{
-	exec "openscriptmenu ingame scoreboard_refresh";	// this will update info
-}
-
-#define SCOREBOARD_TEXT_ALIGNY 10
-#define SCOREBOARD_HEADING_ALIGNY 25
-
-// Text headings of columns
-#define SCOREBOARD_SCORE_TEXT_X 174
-#define SCOREBOARD_KILLS_TEXT_X 210
-#define SCOREBOARD_DEATHS_TEXT_X 228
-#define SCOREBOARD_ASSISTS_TEXT_X 264
-#define SCOREBOARD_DAMAGE_TEXT_X 294
-#define SCOREBOARD_GRENADES_TEXT_X 324
-#define SCOREBOARD_PLANTS_TEXT_X 354
-#define SCOREBOARD_DEFUSES_TEXT_X 388
-#define SCOREBOARD_DEFUSES_TEXT_X_LINE 384	// last one is aligned right
-
-// Columns
-#define SCOREBOARD_HEADING_X 15
-#define SCOREBOARD_NAME_X 33
-
-#define SCOREBOARD_SCORE_X 167
-#define SCOREBOARD_KILLS_X 209
-#define SCOREBOARD_DEATHS_X 226
-#define SCOREBOARD_ASSISTS_X 262
-#define SCOREBOARD_DAMAGE_X 288
-#define SCOREBOARD_GRENADES_X 322
-#define SCOREBOARD_PLANTS_X 352
-#define SCOREBOARD_DEFUSES_X 382
-#define SCOREBOARD_PING_X 420
-
-
-
-#define SCOREBOARD_LINE_1_Y  30
-#define SCOREBOARD_LINE_2_Y  40
-#define SCOREBOARD_LINE_3_Y  50
-#define SCOREBOARD_LINE_4_Y  59
-#define SCOREBOARD_LINE_5_Y  69
-#define SCOREBOARD_LINE_6_Y  79
-#define SCOREBOARD_LINE_7_Y  88
-#define SCOREBOARD_LINE_8_Y  98
-#define SCOREBOARD_LINE_9_Y  108
-#define SCOREBOARD_LINE_10_Y 117
-#define SCOREBOARD_LINE_11_Y 127
-#define SCOREBOARD_LINE_12_Y 137
-#define SCOREBOARD_LINE_13_Y 146
-#define SCOREBOARD_LINE_14_Y 156
-#define SCOREBOARD_LINE_15_Y 166
-#define SCOREBOARD_LINE_16_Y 175
-#define SCOREBOARD_LINE_17_Y 185
-#define SCOREBOARD_LINE_18_Y 195
-#define SCOREBOARD_LINE_19_Y 204
-#define SCOREBOARD_LINE_20_Y 214
-#define SCOREBOARD_LINE_21_Y 224
-#define SCOREBOARD_LINE_22_Y 233
-#define SCOREBOARD_LINE_23_Y 243
-#define SCOREBOARD_LINE_24_Y 253
-#define SCOREBOARD_LINE_25_Y 263
-#define SCOREBOARD_LINE_26_Y 273
-
-#define SCOREBOARD_LINE_BACKGROUND_COLOR 			            .0 .0 .0 .1
-#define SCOREBOARD_LINE_BACKGROUND_COLOR_HIGHLIGHTED 			.2 .2 .2 .7
-
-/*
-type
-0 = nothink
-1 = player line - odd
-2 = player line - even
-3 = player line - highlighted
-
-added _ means that line can be clicked
-
-*/
-
-#define ITEM_SCOREBOARD_LINE(line_id, y_offset) \
-itemDef  \
-{ \
-  style			WINDOW_STYLE_FILLED \
-  rect			10 y_offset 380 10 0 0 \
-  backcolor		SCOREBOARD_LINE_BACKGROUND_COLOR \
-  visible			1 \
-  dvartest		"ui_scoreboard_line_" #line_id \
-  showDvar		{ "2";"2_" } \
-  decoration \
-} \
-itemDef  \
-{ \
-  style			WINDOW_STYLE_FILLED \
-  rect			10 y_offset 380 10 0 0 \
-  backcolor		SCOREBOARD_LINE_BACKGROUND_COLOR_HIGHLIGHTED \
-  visible			1 \
-  dvartest		"ui_scoreboard_line_" #line_id \
-  showDvar		{ "3";"3_" } \
-  decoration \
-}		 \
-itemDef \
-{ \
-  dvar 			"ui_scoreboard_line_" #line_id \
-  textfont		UI_FONT_BIG \
-  textscale		0.32 \
-  textstyle		ITEM_TEXTSTYLE_SHADOWED \
-  textaligny		SCOREBOARD_HEADING_ALIGNY \
-  visible		1 \
-  origin		SCOREBOARD_HEADING_X y_offset \
-  dvartest		"ui_scoreboard_line_" #line_id \
-  hideDvar		{ ""; "0"; "1"; "2"; "3"; "0_"; "1_"; "2_"; "3_"; } \
-  decoration \
-} \
-\
-itemDef  \
-{ \
-	style			WINDOW_STYLE_FILLED \
-	rect			12 y_offset 16 10 0 0 \
-	backcolor		0 0 0 0.7 \
-	visible			1 \
-	dvartest		"ui_scoreboard_line_" #line_id \
-        showDvar		{ "0_"; "1_"; "2_"; "3_"; } \
-	decoration \
-}  \
-itemDef \
-{ \
-	rect			0 y_offset 390 10 0 0 \
-	type			ITEM_TYPE_BUTTON \
-	visible			1 \
-	forecolor		1 1 1 1 \
-	text			"Set" \
-	textfont		UI_FONT_NORMAL \
-	textscale		0.18 \
-	textalign		ITEM_ALIGN_LEFT \
-	textalignx		15 \
-	textaligny		8 \
-	textstyle		ITEM_TEXTSTYLE_SHADOWED \
-	dvartest		"ui_scoreboard_line_" #line_id \
-        showDvar		{ "0_"; "1_"; "2_"; "3_"; } \
-	action \
-	{ \
-		play "mouse_click"; \
-		exec "openscriptmenu ingame scoreboard_setPlayer" #line_id \
-	} \
-	onFocus \
-	{ \
-		play "mouse_over"; \
-	} \
-}
-
-#define ITEM_SCOREBOARD_HEADING_LINE(x, y, h) \
-itemDef \
-{ \
-	style			WINDOW_STYLE_FILLED \
-	rect			x y 0.75 h 0 0 \
-	backcolor		1 1 1 .1 \
-	visible			1 \
-	decoration \
-}
-
-
-
-
-ITEM_TEXT("Score",    SCOREBOARD_SCORE_TEXT_X,   		23, .21, ITEM_ALIGN_CENTER, 1 1 1 1)
-ITEM_TEXT("Kills",    SCOREBOARD_KILLS_TEXT_X,   		23, .21, ITEM_ALIGN_CENTER, 1 1 1 1)
-ITEM_TEXT("Deaths",   SCOREBOARD_DEATHS_TEXT_X,  		33, .21, ITEM_ALIGN_CENTER, 1 1 1 1)
-ITEM_TEXT("Assists",  SCOREBOARD_ASSISTS_TEXT_X, 		23, .21, ITEM_ALIGN_CENTER, 1 1 1 1)
-ITEM_TEXT("Hits",     SCOREBOARD_DAMAGE_TEXT_X,  		33, .21, ITEM_ALIGN_CENTER, 1 1 1 1)
-ITEM_TEXT("Grenades", SCOREBOARD_GRENADES_TEXT_X,		23, .21, ITEM_ALIGN_CENTER, 1 1 1 1)
-ITEM_TEXT("Plants",   SCOREBOARD_PLANTS_TEXT_X,  		33, .21, ITEM_ALIGN_CENTER, 1 1 1 1)
-ITEM_TEXT("Defuses",  SCOREBOARD_DEFUSES_TEXT_X, 		23, .21, ITEM_ALIGN_RIGHT, 1 1 1 1)
-
-ITEM_SCOREBOARD_HEADING_LINE(SCOREBOARD_SCORE_TEXT_X, 		25, 30)
-ITEM_SCOREBOARD_HEADING_LINE(SCOREBOARD_KILLS_TEXT_X, 		25, 30)
-ITEM_SCOREBOARD_HEADING_LINE(SCOREBOARD_DEATHS_TEXT_X, 		35, 20)
-ITEM_SCOREBOARD_HEADING_LINE(SCOREBOARD_ASSISTS_TEXT_X, 	25, 30)
-ITEM_SCOREBOARD_HEADING_LINE(SCOREBOARD_DAMAGE_TEXT_X, 		35, 20)
-ITEM_SCOREBOARD_HEADING_LINE(SCOREBOARD_GRENADES_TEXT_X, 	25, 30)
-ITEM_SCOREBOARD_HEADING_LINE(SCOREBOARD_PLANTS_TEXT_X, 		35, 20)
-ITEM_SCOREBOARD_HEADING_LINE(SCOREBOARD_DEFUSES_TEXT_X_LINE, 	25, 30)
-
-
-
-ITEM_SCOREBOARD_LINE(1, SCOREBOARD_LINE_1_Y)
-//ITEM_SCOREBOARD_LINE(2, SCOREBOARD_LINE_2_Y) // first is always team name
-//ITEM_SCOREBOARD_LINE(3, SCOREBOARD_LINE_3_Y) // first is always team name
-ITEM_SCOREBOARD_LINE(4, SCOREBOARD_LINE_4_Y)
-ITEM_SCOREBOARD_LINE(5, SCOREBOARD_LINE_5_Y)
-ITEM_SCOREBOARD_LINE(6, SCOREBOARD_LINE_6_Y)
-ITEM_SCOREBOARD_LINE(7, SCOREBOARD_LINE_7_Y)
-ITEM_SCOREBOARD_LINE(8, SCOREBOARD_LINE_8_Y)
-ITEM_SCOREBOARD_LINE(9, SCOREBOARD_LINE_9_Y)
-ITEM_SCOREBOARD_LINE(10, SCOREBOARD_LINE_10_Y)
-ITEM_SCOREBOARD_LINE(11, SCOREBOARD_LINE_11_Y)
-ITEM_SCOREBOARD_LINE(12, SCOREBOARD_LINE_12_Y)
-ITEM_SCOREBOARD_LINE(13, SCOREBOARD_LINE_13_Y)
-ITEM_SCOREBOARD_LINE(14, SCOREBOARD_LINE_14_Y)
-ITEM_SCOREBOARD_LINE(15, SCOREBOARD_LINE_15_Y)
-ITEM_SCOREBOARD_LINE(16, SCOREBOARD_LINE_16_Y)
-ITEM_SCOREBOARD_LINE(17, SCOREBOARD_LINE_17_Y)
-ITEM_SCOREBOARD_LINE(18, SCOREBOARD_LINE_18_Y)
-ITEM_SCOREBOARD_LINE(19, SCOREBOARD_LINE_19_Y)
-ITEM_SCOREBOARD_LINE(20, SCOREBOARD_LINE_20_Y)
-ITEM_SCOREBOARD_LINE(21, SCOREBOARD_LINE_21_Y)
-ITEM_SCOREBOARD_LINE(22, SCOREBOARD_LINE_22_Y)
-ITEM_SCOREBOARD_LINE(23, SCOREBOARD_LINE_23_Y)
-ITEM_SCOREBOARD_LINE(24, SCOREBOARD_LINE_24_Y)
-ITEM_SCOREBOARD_LINE(25, SCOREBOARD_LINE_25_Y)
-ITEM_SCOREBOARD_LINE(26, SCOREBOARD_LINE_26_Y)
-
-ITEM_DVAR("ui_scoreboard_names",    SCOREBOARD_NAME_X,     40, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-ITEM_DVAR("ui_scoreboard_scores",   SCOREBOARD_SCORE_X,    40, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-ITEM_DVAR("ui_scoreboard_kills",    SCOREBOARD_KILLS_X,    40, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-ITEM_DVAR("ui_scoreboard_deaths",   SCOREBOARD_DEATHS_X,   40, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-ITEM_DVAR("ui_scoreboard_assists",  SCOREBOARD_ASSISTS_X,  40, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-ITEM_DVAR("ui_scoreboard_damages",  SCOREBOARD_DAMAGE_X,   40, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-ITEM_DVAR("ui_scoreboard_grenades", SCOREBOARD_GRENADES_X, 40, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-ITEM_DVAR("ui_scoreboard_plants",   SCOREBOARD_PLANTS_X,   40, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-ITEM_DVAR("ui_scoreboard_defuses",  SCOREBOARD_DEFUSES_X,  40, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
-ITEM_DVAR("ui_scoreboard_ping",     SCOREBOARD_PING_X,     40, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
diff --git a/source/ui_mp/scriptmenus/submenus/spectatingsystem_left.menu b/source/ui_mp/scriptmenus/submenus/spectatingsystem_left.menu
deleted file mode 100644
index de6f430..0000000
--- a/source/ui_mp/scriptmenus/submenus/spectatingsystem_left.menu
+++ /dev/null
@@ -1,251 +0,0 @@
-#define PLAYERLINE_RED 0.13 0 0 .9
-#define PLAYERLINE_GREEN .03 0.18 .08 .9
-#define PLAYERLINE_BLUE 0.08 0.08 0.33 .9
-#define PLAYERLINE_GRAY .1 .1 .1 .9
-
-#define ITEM_SPECTATINGSYSTEM_LINE(cvarprefix, x_offset, y_offset) \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 150 15 0 0 \
-	backcolor	PLAYERLINE_RED \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "100_red"; "100_red_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 150 15 0 0 \
-	backcolor	PLAYERLINE_GREEN \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "100_green"; "100_green_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 150 15 0 0 \
-	backcolor	PLAYERLINE_BLUE \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "100_blue"; "100_blue_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 150 15 0 0 \
-	backcolor	PLAYERLINE_GRAY \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "100_gray"; "100_gray_" } \
-	decoration \
-} \
-\
-\
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 120 15 0 0 \
-	backcolor	PLAYERLINE_RED \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "80_red"; "80_red_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 120 15 0 0 \
-	backcolor	PLAYERLINE_GREEN \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "80_green"; "80_green_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 120 15 0 0 \
-	backcolor	PLAYERLINE_BLUE \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "80_blue"; "80_blue_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 120 15 0 0 \
-	backcolor	PLAYERLINE_GRAY \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "80_gray"; "80_gray_" } \
-	decoration \
-} \
-\
-\
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 75 15 0 0 \
-	backcolor	PLAYERLINE_RED \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "50_red"; "50_red_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 75 15 0 0 \
-	backcolor	PLAYERLINE_GREEN \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "50_green"; "50_green_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 75 15 0 0 \
-	backcolor	PLAYERLINE_BLUE \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "50_blue"; "50_blue_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 75 15 0 0 \
-	backcolor	PLAYERLINE_GRAY \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "50_gray"; "50_gray_" } \
-	decoration \
-} \
-\
-\
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 15 15 0 0 \
-	backcolor	PLAYERLINE_RED \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "10_red"; "10_red_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 15 15 0 0 \
-	backcolor	PLAYERLINE_GREEN \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "10_green"; "10_green_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 15 15 0 0 \
-	backcolor	PLAYERLINE_BLUE \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "10_blue"; "10_blue_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 15 15 0 0 \
-	backcolor	PLAYERLINE_GRAY \
-	visible		1 \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "10_gray"; "10_gray_" } \
-	decoration \
-} \
-\
-\
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 15 15 0 0 \
-	backcolor	1 1 1 .5 \
-	origin		135 0 \
-	visible		1 \
-	background	"gfx/hud/death_suicide.tga" \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "0"; "0_";  } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 12 10 0 0 \
-	origin		152 3 \
-	backcolor	1 1 1 .9 \
-	visible		1 \
-	background	"ui/assets/scrollbar_arrow_left.tga" \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "0_";  "10_red_";"10_green_";"10_blue_";"10_gray_";  "50_red_";"50_green_";"50_blue_";"50_gray_";  "80_red_"; "80_green_"; "80_blue_"; "80_gray_";  "100_red_";"100_green_";"100_blue_";"100_gray_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	style		WINDOW_STYLE_FILLED \
-	rect		x_offset y_offset 12 10 0 0 \
-	origin		-14 3 \
-	backcolor	1 1 1 .9 \
-	visible		1 \
-	background	"ui/assets/scrollbar_arrow_right.tga" \
-	dvartest	cvarprefix "_health" \
-	showDvar	{ "0_";  "10_red_";"10_green_";"10_blue_";"10_gray_";  "50_red_";"50_green_";"50_blue_";"50_gray_";  "80_red_"; "80_green_"; "80_blue_"; "80_gray_";  "100_red_";"100_green_";"100_blue_";"100_gray_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	rect			x_offset y_offset 150 15 0 0 \
-	origin			8 0 \
-	type			ITEM_TYPE_TEXT \
-	visible			1 \
-	forecolor		1 1 1 1 \
-	textfont		UI_FONT_NORMAL \
-	textscale		.18 \
-	textalign		ITEM_ALIGN_LEFT \
-	textaligny		12 \
-	textstyle		ITEM_TEXTSTYLE_SHADOWED \
-	dvar			cvarprefix "_text" \
-	dvartest		cvarprefix "_health" \
-	hideDvar		{ ""; "0"; "0_" } \
-	decoration \
-} \
-itemDef \
-{ \
-	rect			x_offset y_offset 150 15 0 0 \
-	origin			8 0 \
-	type			ITEM_TYPE_TEXT \
-	visible			1 \
-	forecolor		1 1 1 .5 \
-	textfont		UI_FONT_NORMAL \
-	textscale		.18 \
-	textalign		ITEM_ALIGN_LEFT \
-	textaligny		12 \
-	textstyle		ITEM_TEXTSTYLE_SHADOWED \
-	dvar			cvarprefix "_text" \
-	dvartest		cvarprefix "_health" \
-	showDvar		{ "0"; "0_" } \
-	decoration \
-}
-
-
-ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team1_player0", 0, 0)
-ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team1_player1", 0, 16)
-ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team1_player2", 0, 32)
-ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team1_player3", 0, 48)
-ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team1_player4", 0, 64)
diff --git a/source/ui_mp/scriptmenus/submenus/spectatingsystem_right.menu b/source/ui_mp/scriptmenus/submenus/spectatingsystem_right.menu
deleted file mode 100644
index 263d993..0000000
--- a/source/ui_mp/scriptmenus/submenus/spectatingsystem_right.menu
+++ /dev/null
@@ -1,7 +0,0 @@
-// Using preprocessor from spectatingsystem_right.menu
-
-ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team2_player0", -150, 0)
-ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team2_player1", -150, 16)
-ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team2_player2", -150, 32)
-ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team2_player3", -150, 48)
-ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team2_player4", -150, 64)
diff --git a/source/ui_mp/scriptmenus/submenus/spectator.menu b/source/ui_mp/scriptmenus/submenus/spectator.menu
new file mode 100644
index 0000000..b756b3e
--- /dev/null
+++ b/source/ui_mp/scriptmenus/submenus/spectator.menu
@@ -0,0 +1,348 @@
+menuDef
+{
+  	name			quickmessage_spectatingsystem_menu
+	rect			0 0 0 0
+	focuscolor		GLOBAL_FOCUSED_COLOR
+	style			WINDOW_STYLE_EMPTY
+	fullscreen		0
+
+	onOpen
+	{
+		// First open scoreboard
+		// Its in separated menu because of number of items game limitatin
+		close quickmessage_spectatingsystem_menu_scoreboard_sd;
+		uiScript openMenuOnDvar ui_scoreboard_show "sd" quickmessage_spectatingsystem_menu_scoreboard_sd;
+		uiScript openMenuOnDvar ui_scoreboard_show "sd" quickmessage_spectatingsystem_menu_scoreboard_sd_lines;
+
+		// Overlay
+		open "quickmessage_spectatingsystem_menu_overlay"
+	}
+	onClose
+	{
+		close "quickmessage_spectatingsystem_menu_overlay"
+		close "quickmessage_spectatingsystem_menu_scoreboard_sd"
+		close "quickmessage_spectatingsystem_menu_scoreboard_sd_lines"
+		close "quickmessage_spectatingsystem_menu_killcam"
+	}
+}
+
+menuDef
+{
+  	name			quickmessage_spectatingsystem_menu_overlay
+	rect			-128 0 896 480
+	focuscolor		GLOBAL_FOCUSED_COLOR
+	style			WINDOW_STYLE_EMPTY
+	fullscreen		0
+
+	onOpen
+	{
+		exec "openscriptmenu spectatingsystem menu_open";
+	}
+	onClose
+	{
+		setDvar cl_bypassMouseInput "0" // enable cursor movement
+	}
+	onEsc
+	{
+		exec "openscriptmenu spectatingsystem menu_close";
+		close quickmessage_spectatingsystem_menu;
+	}
+
+
+	execKeyInt 200 { play "mouse_click"; exec "openscriptmenu spectatingsystem mouse1" } // left mouse
+	execKeyInt 201 { play "mouse_click"; exec "openscriptmenu spectatingsystem mouse2" } // right mouse
+	execKeyInt 202 { play "mouse_click"; exec "openscriptmenu spectatingsystem mouse3" } // middle
+
+	// shift
+	execKeyInt 160 {
+		play "mouse_click";
+		exec "openscriptmenu spectatingsystem shift;";
+		close quickmessage_spectatingsystem_menu;
+	}
+
+
+	execKey "1" { play "mouse_click"; exec "openscriptmenu spectatingsystem follow_1" }
+	execKey "2" { play "mouse_click"; exec "openscriptmenu spectatingsystem follow_2" }
+	execKey "3" { play "mouse_click"; exec "openscriptmenu spectatingsystem follow_3" }
+	execKey "4" { play "mouse_click"; exec "openscriptmenu spectatingsystem follow_4" }
+	execKey "5" { play "mouse_click"; exec "openscriptmenu spectatingsystem follow_5" }
+	execKey "6" { play "mouse_click"; exec "openscriptmenu spectatingsystem follow_6" }
+	execKey "7" { play "mouse_click"; exec "openscriptmenu spectatingsystem follow_7" }
+	execKey "8" { play "mouse_click"; exec "openscriptmenu spectatingsystem follow_8" }
+	execKey "9" { play "mouse_click"; exec "openscriptmenu spectatingsystem follow_9" }
+	execKey "0" { play "mouse_click"; exec "openscriptmenu spectatingsystem follow_10" }
+
+
+	execKey "r" { play "mouse_click"; open quickmessage_spectatingsystem_menu_killcam; }
+	execKey "x"  { play "mouse_click"; exec "openscriptmenu spectatingsystem xray" }
+	execKey "h"  { play "mouse_click"; exec "openscriptmenu spectatingsystem hit" }
+	execKey "f"  { play "mouse_click"; exec "+activate; -activate" } // simulate F bind press
+	execKeyInt 32 { play "mouse_click"; exec "openscriptmenu spectatingsystem help" } // space
+
+
+	execKey "t"  { play "mouse_click"; exec "openscriptmenu spectatingsystem warning" }
+
+	execKeyInt 9 { play "mouse_click"; exec "openscriptmenu spectatingsystem score" } // tab
+
+	execKeyInt 178 { play "mouse_click"; exec "screenshotJpeg"; } // F12
+
+	//
+	// Horizontal align right items have for some reason offset -128
+	//
+
+
+	ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team1_player0", 128, 154, HORIZONTAL_ALIGN_LEFT)
+	ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team1_player1", 128, 178, HORIZONTAL_ALIGN_LEFT)
+	ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team1_player2", 128, 202, HORIZONTAL_ALIGN_LEFT)
+	ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team1_player3", 128, 226, HORIZONTAL_ALIGN_LEFT)
+	ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team1_player4", 128, 250, HORIZONTAL_ALIGN_LEFT)
+
+	ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team2_player0", 0, 154, HORIZONTAL_ALIGN_RIGHT)
+	ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team2_player1", 0, 178, HORIZONTAL_ALIGN_RIGHT)
+	ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team2_player2", 0, 202, HORIZONTAL_ALIGN_RIGHT)
+	ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team2_player3", 0, 226, HORIZONTAL_ALIGN_RIGHT)
+	ITEM_SPECTATINGSYSTEM_LINE("ui_spectatingsystem_team2_player4", 0, 250, HORIZONTAL_ALIGN_RIGHT)
+
+	// Team 1: ###########
+	ITEM_SPECTATINGSYSTEM_DVAR(240, 453, 0.2, "ui_spectatingsystem_team1_scoreProgress", HORIZONTAL_ALIGN_LEFT)
+	ITEM_SPECTATINGSYSTEM_DVAR(240, 463, 0.2, "ui_spectatingsystem_team2_scoreProgress", HORIZONTAL_ALIGN_LEFT)
+
+	// 5v5  5v4  5v3  4v3
+	ITEM_SPECTATINGSYSTEM_DVAR(-157, 463, 0.2, "ui_spectatingsystem_playerProgress", HORIZONTAL_ALIGN_RIGHT)
+
+
+
+	// Keys weclome
+	itemDef
+	{
+		style			WINDOW_STYLE_FILLED
+		visible			1
+		rect			43 205 170 90 HORIZONTAL_ALIGN_CENTER 0
+		backcolor		0 0 0 0.7975
+		dvartest		"ui_spectatorsystem_keysWelcome"
+		showDvar 		{ "1" }
+		decoration
+	}
+	ITEM_SPECTATINGSYSTEM_KEY("Spectating system", 						48, 220, 0.22, HORIZONTAL_ALIGN_CENTER, "ui_spectatorsystem_keysWelcome")
+
+	ITEM_SPECTATINGSYSTEM_KEY("You are now in spectating system menu.", 			48, 240, 0.18, HORIZONTAL_ALIGN_CENTER, "ui_spectatorsystem_keysWelcome")
+	ITEM_SPECTATINGSYSTEM_KEY("Your binds are not working in this mode.", 			48, 250, 0.18, HORIZONTAL_ALIGN_CENTER, "ui_spectatorsystem_keysWelcome")
+	ITEM_SPECTATINGSYSTEM_KEY("To use them (for scoreboard or chat) you have", 		48, 260, 0.18, HORIZONTAL_ALIGN_CENTER, "ui_spectatorsystem_keysWelcome")
+	ITEM_SPECTATINGSYSTEM_KEY("to first close spectating system with ^3[ESC]^7 key.", 	48, 270, 0.18, HORIZONTAL_ALIGN_CENTER, "ui_spectatorsystem_keysWelcome")
+
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[Space]^7 to confirm (and show / hide help).", 	48, 290, 0.18, HORIZONTAL_ALIGN_CENTER, "ui_spectatorsystem_keysWelcome")
+
+
+
+	// Keys help
+	itemDef
+	{
+		style			WINDOW_STYLE_FILLED
+		visible			1
+		rect			-52 27 170 115 HORIZONTAL_ALIGN_RIGHT 0
+		backcolor		0 0 0 0.7975
+		dvartest		"ui_spectatorsystem_keys"
+		showDvar 		{ "1" }
+		decoration
+	}
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[Left Mouse]^7 to follow next player", 	-48, 40, 0.18, HORIZONTAL_ALIGN_RIGHT, "ui_spectatorsystem_keys")
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[Right Mouse]^7 to follow previous player", 	-48, 50, 0.18, HORIZONTAL_ALIGN_RIGHT, "ui_spectatorsystem_keys")
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[Middle Mouse]^7 to toggle Auto-Spectator", 	-48, 60, 0.18, HORIZONTAL_ALIGN_RIGHT, "ui_spectatorsystem_keys")
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[R]^7 to replay kill", 			-48, 70, 0.18, HORIZONTAL_ALIGN_RIGHT, "ui_spectatorsystem_keys")
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[X]^7 to toggle XRAY", 			-48, 80, 0.18, HORIZONTAL_ALIGN_RIGHT, "ui_spectatorsystem_keys")
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[H]^7 to toggle showing hit values", 	-48, 90, 0.18, HORIZONTAL_ALIGN_RIGHT, "ui_spectatorsystem_keys")
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[1,2,3,4,5]^7 to follow player from team 1", -48, 100, 0.18, HORIZONTAL_ALIGN_RIGHT, "ui_spectatorsystem_keys")
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[6,7,8,9,0]^7 to follow player from team 2", -48, 110, 0.18, HORIZONTAL_ALIGN_RIGHT, "ui_spectatorsystem_keys")
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[TAB]^7 to show / hide scoreboard", 		-48, 120, 0.18, HORIZONTAL_ALIGN_RIGHT, "ui_spectatorsystem_keys")
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[ESC]^7 to close spectating system menu", 	-48, 130, 0.18, HORIZONTAL_ALIGN_RIGHT, "ui_spectatorsystem_keys")
+	ITEM_SPECTATINGSYSTEM_KEY("Press ^3[Space]^7 to show / hide help", 		-48, 140, 0.18, HORIZONTAL_ALIGN_RIGHT, "ui_spectatorsystem_keys")
+
+}
+
+
+menuDef
+{
+  	name			quickmessage_spectatingsystem_menu_killcam
+	rect			-430 0 0 0 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP
+	style			0
+	fullscreen		0
+
+	onOpen
+	{
+		exec "openscriptmenu spectatingsystem killcam_open";
+	}
+	onClose
+	{
+	}
+	onEsc
+	{
+		play "mouse_click";
+		close quickmessage_spectatingsystem_menu_killcam;
+		exec "openscriptmenu spectatingsystem killcam_close";
+	}
+	execKey "r"
+	{
+		play "mouse_click";
+		close quickmessage_spectatingsystem_menu_killcam;
+		exec "openscriptmenu spectatingsystem killcam_close";
+	}
+	// shift
+	execKeyInt 160 {
+		// avoid shift press when free spectating
+	}
+
+	execKey "1" { close quickmessage_spectatingsystem_menu_killcam; exec "openscriptmenu spectatingsystem killcam_1" }
+	execKey "2" { close quickmessage_spectatingsystem_menu_killcam; exec "openscriptmenu spectatingsystem killcam_2" }
+	execKey "3" { close quickmessage_spectatingsystem_menu_killcam; exec "openscriptmenu spectatingsystem killcam_3" }
+	execKey "4" { close quickmessage_spectatingsystem_menu_killcam; exec "openscriptmenu spectatingsystem killcam_4" }
+	execKey "5" { close quickmessage_spectatingsystem_menu_killcam; exec "openscriptmenu spectatingsystem killcam_5" }
+	execKey "6" { close quickmessage_spectatingsystem_menu_killcam; exec "openscriptmenu spectatingsystem killcam_6" }
+	execKey "7" { close quickmessage_spectatingsystem_menu_killcam; exec "openscriptmenu spectatingsystem killcam_7" }
+	execKey "8" { close quickmessage_spectatingsystem_menu_killcam; exec "openscriptmenu spectatingsystem killcam_8" }
+	execKey "9" { close quickmessage_spectatingsystem_menu_killcam; exec "openscriptmenu spectatingsystem killcam_9" }
+	execKey "0" { close quickmessage_spectatingsystem_menu_killcam; exec "openscriptmenu spectatingsystem killcam_10" }
+
+
+
+	itemDef
+	{
+		name			"window_background"
+		visible			1
+		rect			160 250 200 170 0 0
+		origin			0 0
+		style			WINDOW_STYLE_FILLED
+		forecolor		1 1 1 1
+		backcolor		0 0 0 0.7975
+		decoration
+	}
+
+	ITEM_TEXT("Actions to replay:", 170, 270, 0.25, ITEM_ALIGN_LEFT, 1 1 1 1)
+
+	ITEM_DVAR("ui_spectatorsystem_menu_text", 170, 285, .2, ITEM_ALIGN_LEFT, 1 1 1 1)
+
+	ITEM_TEXT("(only 40 seconds of history can be saved)", 170, 405, 0.18, ITEM_ALIGN_LEFT, 1 1 1 0.5)
+
+	ITEM_TEXT("@QUICKMESSAGE_ESC_EXIT", 170, 415, 0.2, ITEM_ALIGN_LEFT, 1 1 1 1)
+}
+
+
+
+
+menuDef
+{
+	name			"quickmessage_spectatingsystem_menu_scoreboard_sd"
+	rect			120 40 400 430
+	focuscolor		GLOBAL_FOCUSED_COLOR
+	style			WINDOW_STYLE_EMPTY
+	blurWorld		0
+
+
+	itemDef
+	{
+		style			WINDOW_STYLE_FILLED
+		rect			0 0 400 400 0 0
+		backcolor		.0 .0 .0 .8
+		visible			1
+		dvartest		"ui_scoreboard_visible"
+	        showDvar		{ "1"; }
+		decoration
+	}
+
+
+	// WINDOW LINES 400x430
+	itemDef // TOP
+	{
+		visible			1
+		rect			3 3 394 2
+		style			WINDOW_STYLE_FILLED
+		backcolor		1 1 1 .125
+		dvartest		"ui_scoreboard_visible"
+	        showDvar		{ "1"; }
+		decoration
+	}
+	itemDef // RIGHT
+	{
+		visible			1
+		rect			395 5 2 390
+		style			WINDOW_STYLE_FILLED
+		backcolor		1 1 1 .125
+		dvartest		"ui_scoreboard_visible"
+	        showDvar		{ "1"; }
+		decoration
+	}
+	itemDef // BOTTOM
+	{
+		visible			1
+		rect			3 395 394 2
+		style			WINDOW_STYLE_FILLED
+		backcolor		1 1 1 .125
+		dvartest		"ui_scoreboard_visible"
+	        showDvar		{ "1"; }
+		decoration
+	}
+	itemDef // LEFT
+	{
+		visible			1
+		rect			3 5 2 390
+		style			WINDOW_STYLE_FILLED
+		backcolor		1 1 1 .125
+		dvartest		"ui_scoreboard_visible"
+	        showDvar		{ "1"; }
+		decoration
+	}
+
+	// Top separator
+	itemDef
+	{
+		visible			1
+		rect			5 30 390 1
+		style			WINDOW_STYLE_FILLED
+		backcolor		1 1 1 .125
+		dvartest		"ui_scoreboard_visible"
+	        showDvar		{ "1"; }
+		decoration
+	}
+
+	itemDef
+	{
+		text        		"@MPUI_SEARCH_AND_DESTROY"
+		textfont		UI_FONT_BIG
+		textscale		0.4
+		textstyle		ITEM_TEXTSTYLE_SHADOWED
+		textaligny		0
+		textalign		ITEM_ALIGN_LEFT
+		visible			1
+		origin			10 26
+		dvartest		"ui_scoreboard_visible"
+	        showDvar		{ "1"; }
+		decoration
+	}
+
+	itemDef
+	{
+		dvar 			"ui_scoreboard_map"
+		textfont		UI_FONT_BIG
+		textscale		0.4
+		textstyle		ITEM_TEXTSTYLE_SHADOWED
+		textaligny		0
+		textalign		ITEM_ALIGN_RIGHT
+		visible			1
+		origin			390 26
+		dvartest		"ui_scoreboard_visible"
+	        showDvar		{ "1"; }
+		decoration
+	}
+}
+
+
+
+menuDef
+{
+	name			"quickmessage_spectatingsystem_menu_scoreboard_sd_lines"
+	rect			120 68 400 430
+	focuscolor		GLOBAL_FOCUSED_COLOR
+	style			WINDOW_STYLE_EMPTY
+	blurWorld		0
+
+	ITEM_SCOREBOARD(0, 0)
+}
diff --git a/source/ui_mp/scriptmenus/team_americangerman.menu b/source/ui_mp/scriptmenus/team_americangerman.menu
index 64c4c6a..73e9539 100644
--- a/source/ui_mp/scriptmenus/team_americangerman.menu
+++ b/source/ui_mp/scriptmenus/team_americangerman.menu
@@ -55,6 +55,11 @@
 		// Bottom: 4. Spectate
 		ITEM_BUTTON			(ORIGIN_CHOICE4, "@MPUI_4_SPECTATE", ;, scriptMenuResponse "spectator")
 
+		// Bottom: 5. Streamer
+		ITEM_BUTTON_ONDVAR		(ORIGIN_CHOICE5, "5. Streamer", "ui_allow_joinstreamer", showDvar{"1"}, ; , scriptMenuResponse "streamer")
+
+
+
 
 		// Rcon buttons
 		#include "ui_mp/scriptmenus/submenus/rcon_buttons.menu"
@@ -81,6 +86,7 @@
 		execKey "2" { play "mouse_click"; exec "openscriptmenu team_americangerman allies" }
 		execKey "3" { play "mouse_click"; exec "openscriptmenu team_americangerman axis" }
 		execKey "4" { play "mouse_click"; exec "openscriptmenu team_americangerman spectator" }
+		execKey "5" { play "mouse_click"; exec "openscriptmenu team_russiangerman streamer" }
 
 		execKeyInt 32 { play "mouse_click"; close team_americangerman; open main; } // space
 		execKeyInt 105 { play "mouse_click"; exec "openscriptmenu ingame serverinfo" } // i
diff --git a/source/ui_mp/scriptmenus/team_britishgerman.menu b/source/ui_mp/scriptmenus/team_britishgerman.menu
index 4551c28..db8d877 100644
--- a/source/ui_mp/scriptmenus/team_britishgerman.menu
+++ b/source/ui_mp/scriptmenus/team_britishgerman.menu
@@ -55,6 +55,9 @@
 		// Bottom: 4. Spectate
 		ITEM_BUTTON			(ORIGIN_CHOICE4, "@MPUI_4_SPECTATE", ;, scriptMenuResponse "spectator")
 
+		// Bottom: 5. Streamer
+		ITEM_BUTTON_ONDVAR		(ORIGIN_CHOICE5, "5. Streamer", "ui_allow_joinstreamer", showDvar{"1"}, ; , scriptMenuResponse "streamer")
+
 
 		// Rcon buttons
 		#include "ui_mp/scriptmenus/submenus/rcon_buttons.menu"
@@ -81,6 +84,7 @@
 		execKey "2" { play "mouse_click"; exec "openscriptmenu team_britishgerman allies" }
 		execKey "3" { play "mouse_click"; exec "openscriptmenu team_britishgerman axis" }
 		execKey "4" { play "mouse_click"; exec "openscriptmenu team_britishgerman spectator" }
+		execKey "5" { play "mouse_click"; exec "openscriptmenu team_russiangerman streamer" }
 
 		execKeyInt 32 { play "mouse_click"; close team_britishgerman; open main; } // space
 		execKeyInt 105 { play "mouse_click"; exec "openscriptmenu ingame serverinfo" } // i
diff --git a/source/ui_mp/scriptmenus/team_russiangerman.menu b/source/ui_mp/scriptmenus/team_russiangerman.menu
index f4f0dac..bc042c7 100644
--- a/source/ui_mp/scriptmenus/team_russiangerman.menu
+++ b/source/ui_mp/scriptmenus/team_russiangerman.menu
@@ -55,6 +55,9 @@
 		// Bottom: 4. Spectate
 		ITEM_BUTTON			(ORIGIN_CHOICE4, "@MPUI_4_SPECTATE", ;, scriptMenuResponse "spectator")
 
+		// Bottom: 5. Streamer
+		ITEM_BUTTON_ONDVAR		(ORIGIN_CHOICE5, "5. Streamer", "ui_allow_joinstreamer", showDvar{"1"}, ; , scriptMenuResponse "streamer")
+
 
 		// Rcon buttons
 		#include "ui_mp/scriptmenus/submenus/rcon_buttons.menu"
@@ -81,6 +84,7 @@
 		execKey "2" { play "mouse_click"; exec "openscriptmenu team_russiangerman allies" }
 		execKey "3" { play "mouse_click"; exec "openscriptmenu team_russiangerman axis" }
 		execKey "4" { play "mouse_click"; exec "openscriptmenu team_russiangerman spectator" }
+		execKey "5" { play "mouse_click"; exec "openscriptmenu team_russiangerman streamer" }
 
 		execKeyInt 32 { play "mouse_click"; close team_russiangerman; open main; } // space
 		execKeyInt 105 { play "mouse_click"; exec "openscriptmenu ingame serverinfo" } // i
diff --git a/source/ui_mp/wm_quickmessage.menu b/source/ui_mp/wm_quickmessage.menu
index e56a6e6..061752b 100644
--- a/source/ui_mp/wm_quickmessage.menu
+++ b/source/ui_mp/wm_quickmessage.menu
@@ -25,16 +25,7 @@
 	}
 
 
-	menuDef
-	{
-	  	name quickmessage_spectatingsystem_menu
-	  	fullScreen 0
-	  	visible 0
-	    	rect 0 0 0 0 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_TOP
-
-		#include "ui_mp/scriptmenus/spectatingsystem.menu"
-	}
-
+	#include "ui_mp/scriptmenus/submenus/spectator.menu"
 
 
 	menuDef
diff --git a/zip/main/server.cfg b/zip/main/server.cfg
index 9c20395..95ddc36 100644
--- a/zip/main/server.cfg
+++ b/zip/main/server.cfg
@@ -38,10 +38,10 @@ set g_gametype "sd"  // sd, dm, tdm, hq, ctf, htf, re, strat
 set pam_mode "comp"
 
 // Hostname
-set sv_hostname "Awesome zPAM3.32 server"
+set sv_hostname "Awesome zPAM3.33 server"
 
 // Message of the Day
-set scr_motd "Welcome. This server is running zPAM3.32\nhttps://github.com/eyza-cod2/zpam3"
+set scr_motd "Welcome. This server is running zPAM3.33\nhttps://github.com/eyza-cod2/zpam3"
 
 // Server password
 set g_password ""
@@ -55,7 +55,7 @@ seta sv_wwwDlDisconnected "0"
 seta sv_wwwDownload "1"
 
 // Other
-set logfile "0"			// Enable console logging into console_mp.log; 1=buffered; 2=continuous
+set logfile "0"			// Enable console logging into console_mp.log, 1=buffered, 2=continuous
 set g_log "games_mp.log"	// If set, log game events into file (like player connect, disconnect, kill, damage, ...)
 set g_logsync "0"		// Write data continuously
 
@@ -133,7 +133,6 @@ set scr_hq_respawn_time 10		// Time after wich player is respawned
 set scr_hq_neutralizing_points 10
 set scr_hq_radio_respawn_time 15
 set scr_hq_radio_hold_time 120
-set scr_hq_multiple_capture 1
 set scr_hq_restricted_smoke 0		// Get smoke only if radio is take by some team