diff --git a/uran/TODO b/uran/TODO
index 79e2164d..6b6e301e 100644
--- a/uran/TODO
+++ b/uran/TODO
@@ -1,19 +1,18 @@
 MAX -> MIN priority
 
 AirStuck FIX
-Huntsman autoshoot
 Aim Stickies
 Proj Aim Buildings
 no aim sapper/banner
 Triggerbot ignores vaccinator ubers
 Proper ambassador detection (not just CTFRevolver)
-No AutoShoot (aimbot/trigger) on consumables and PDAs
+No AutoShoot (trigger) on consumables and PDAs
 Improve Projectile Aimbot. A lot.
 Integrate SEGVCATCH
 Proper AutoHitbox
 Smoothe the smooth aim
+Display on the left
 Jumping ProjAim
-Aim Key mode (inverse/normal/disabled)
 Flare aim on fire
 Trigger ambassador correction
 ESP Icons
@@ -25,7 +24,6 @@ Engine Prediction
 An option to ignore taunting enemies
 AutoSticky improve
 No AutoShoot when disguised
-Fixing NoZoom flickering
 Ambassador bodyshotting
 No Trigger Mediguns
 FOV = Float
diff --git a/uran/src/hacks/Aimbot.cpp b/uran/src/hacks/Aimbot.cpp
index 7a8d9662..7035abae 100644
--- a/uran/src/hacks/Aimbot.cpp
+++ b/uran/src/hacks/Aimbot.cpp
@@ -42,6 +42,8 @@ Aimbot::Aimbot() {
 	target_systems[0] = new TargetSystemSmart();
 	target_systems[1] = new TargetSystemFOV();
 	target_systems[2] = new TargetSystemDistance();
+	m_bAimKeySwitch = false;
+	this->v_iAimKeyMode = CreateConVar("u_aimbot_aimkey_mode", "1", "AimKey mode [DISABLED/PTE/PTD/TOGGLE]");
 	this->v_bEnabled = CreateConVar("u_aimbot_enabled", "0", "Enables aimbot. EXPERIMENTAL AND TOTALLY NOT LEGIT");
 	this->v_iHitbox = CreateConVar("u_aimbot_hitbox", "0", "Hitbox");
 	this->v_bAutoHitbox = CreateConVar("u_aimbot_autohitbox", "1", "Autohitbox");
@@ -58,7 +60,7 @@ Aimbot::Aimbot() {
 	this->v_bProjectileAimbot = CreateConVar("u_aimbot_projectile", "1", "Projectile aimbot (EXPERIMENTAL)");
 	this->v_iOverrideProjSpeed = CreateConVar("u_aimbot_proj_speed", "0", "Override proj speed");
 	this->v_bDebug = CreateConVar("u_aimbot_debug", "0", "Aimbot debug");
-	this->v_iFOV = CreateConVar("u_aimbot_fov", "0", "FOV aimbot (experimental)");
+	this->v_fFOV = CreateConVar("u_aimbot_fov", "0", "Aimbot fov");
 	this->v_bMachinaPenetration = CreateConVar("u_aimbot_machina", "0", "Machina penetration aimbot (just for fun)");
 	this->v_bSmooth = CreateConVar("u_aimbot_smooth", "0", "Smooth aimbot");
 	this->v_flAutoShootHuntsmanCharge = CreateConVar("u_aimbot_huntsman_charge", "0.5", "Huntsman autoshoot charge");
@@ -76,11 +78,16 @@ Aimbot::Aimbot() {
 bool Aimbot::CreateMove(void*, float, CUserCmd* cmd) {
 	if (!this->v_bEnabled->GetBool()) return true;
 	this->m_iLastTarget = -1;
-	if (this->v_iAimKey->GetBool()) {
-		//bool down = false;
-		//interfaces::baseClient->IN_IsKeyDown(this->v_iAimKey->GetString(), down);
-		if (!interfaces::input->IsButtonDown((ButtonCode_t)this->v_iAimKey->GetInt())) {
+	if (this->v_iAimKey->GetBool() && this->v_iAimKeyMode->GetBool()) {
+		bool key_down = interfaces::input->IsButtonDown((ButtonCode_t)this->v_iAimKey->GetInt());
+		switch (this->v_iAimKeyMode->GetInt()) {
+		case AimKeyMode_t::PRESS_TO_ENABLE:
+			break;
+		case AimKeyMode_t::PRESS_TO_DISABLE:
 			return true;
+		case AimKeyMode_t::PRESS_TO_TOGGLE:
+			m_bAimKeySwitch = !m_bAimKeySwitch;
+			if (!m_bAimKeySwitch) return true;
 		}
 	}
 
@@ -286,7 +293,7 @@ bool Aimbot::ShouldTarget(IClientEntity* entity) {
 				if (!IsEntityVisible(entity, m_iHitbox)) return false;
 			}
 		}
-		if (v_iFOV->GetBool() && (GetFov(g_pLocalPlayer->v_OrigViewangles, g_pLocalPlayer->v_Eye, resultAim) > v_iFOV->GetFloat())) return false;
+		if (v_fFOV->GetFloat() > 0.0f && (GetFov(g_pLocalPlayer->v_OrigViewangles, g_pLocalPlayer->v_Eye, resultAim) > v_fFOV->GetFloat())) return false;
 		return true;
 	} else if (IsBuilding(entity)) {
 		if (!v_bAimBuildings->GetBool()) return false;
@@ -307,7 +314,7 @@ bool Aimbot::ShouldTarget(IClientEntity* entity) {
 			if (!IsBuildingVisible(entity)) return false;
 		}
 		//logging::Info("IsFOV?");
-		if (v_iFOV->GetBool() && (GetFov(g_pLocalPlayer->v_OrigViewangles, g_pLocalPlayer->v_Eye, resultAim) > v_iFOV->GetFloat())) return false;
+		if (v_fFOV->GetFloat() > 0.0f && (GetFov(g_pLocalPlayer->v_OrigViewangles, g_pLocalPlayer->v_Eye, resultAim) > v_fFOV->GetFloat())) return false;
 		//logging::Info("Tru");
 		return true;
 	} else {
diff --git a/uran/src/hacks/Aimbot.h b/uran/src/hacks/Aimbot.h
index de153757..094592e8 100644
--- a/uran/src/hacks/Aimbot.h
+++ b/uran/src/hacks/Aimbot.h
@@ -14,6 +14,15 @@ class ConVar;
 class IClientEntity;
 class Vector;
 
+struct AimKeyMode_t {
+	enum {
+		DISABLED,
+		PRESS_TO_ENABLE,
+		PRESS_TO_DISABLE,
+		PRESS_TO_TOGGLE
+	};
+};
+
 class Aimbot : public IHack {
 public:
 	DECLARE_HACK_METHODS();
@@ -29,12 +38,14 @@ public:
 
 	int m_iLastTarget;
 	int m_iHitbox;
+	bool m_bAimKeySwitch;
 	ConVar* v_iAimKey;
+	ConVar* v_iAimKeyMode;
 	ConVar* v_bSmooth;
 	ConVar* v_fSmoothValue;
 	ConVar* v_bDebug;
 	ConVar* v_bEnabled;
-	ConVar* v_iFOV;
+	ConVar* v_fFOV;
 	ConVar* v_iHitbox;
 	ConVar* v_bAutoHitbox;
 	ConVar* v_bPrediction;