diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index bfed5cc6..31648103 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -1194,27 +1194,27 @@ Cmd_Wave_f(edict_t *ent)
 
 	switch (i)
 	{
-		case 0:
+		case GESTURE_FLIP_OFF:
 			gi.cprintf(ent, PRINT_HIGH, "flipoff\n");
 			ent->s.frame = FRAME_flip01 - 1;
 			ent->client->anim_end = FRAME_flip12;
 			break;
-		case 1:
+		case GESTURE_SALUTE:
 			gi.cprintf(ent, PRINT_HIGH, "salute\n");
 			ent->s.frame = FRAME_salute01 - 1;
 			ent->client->anim_end = FRAME_salute11;
 			break;
-		case 2:
+		case GESTURE_TAUNT:
 			gi.cprintf(ent, PRINT_HIGH, "taunt\n");
 			ent->s.frame = FRAME_taunt01 - 1;
 			ent->client->anim_end = FRAME_taunt17;
 			break;
-		case 3:
+		case GESTURE_WAVE:
 			gi.cprintf(ent, PRINT_HIGH, "wave\n");
 			ent->s.frame = FRAME_wave01 - 1;
 			ent->client->anim_end = FRAME_wave11;
 			break;
-		case 4:
+		case GESTURE_POINT:
 		default:
 			gi.cprintf(ent, PRINT_HIGH, "point\n");
 			ent->s.frame = FRAME_point01 - 1;
diff --git a/src/game/g_main.c b/src/game/g_main.c
index 1849deb3..fffbcd4b 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -105,6 +105,7 @@ cvar_t *g_swap_speed;
 cvar_t *g_language;
 cvar_t *g_itemsbobeffect;
 cvar_t *g_start_items;
+cvar_t *ai_model_scale;
 cvar_t *g_game;
 
 static void G_RunFrame(void);
diff --git a/src/game/g_monster.c b/src/game/g_monster.c
index ec60c6f3..d10defac 100644
--- a/src/game/g_monster.c
+++ b/src/game/g_monster.c
@@ -1132,6 +1132,12 @@ monster_start(edict_t *self)
 		self->monsterinfo.checkattack = M_CheckAttack;
 	}
 
+	if (ai_model_scale->value > 0)
+	{
+		scale = ai_model_scale->value;
+		VectorSet(self->rrs.scale, scale, scale, scale);
+	}
+
 	scale = 0;
 
 	for (i = 0; i < 3; i++)
diff --git a/src/game/header/game.h b/src/game/header/game.h
index c0d3f4f4..82f18662 100644
--- a/src/game/header/game.h
+++ b/src/game/header/game.h
@@ -56,6 +56,18 @@ typedef enum
 	SOLID_BSP       /* bsp clip, touch on edge */
 } solid_t;
 
+typedef enum
+{
+	GESTURE_NONE = -1,
+	GESTURE_FLIP_OFF,
+	GESTURE_SALUTE,
+	GESTURE_TAUNT,
+	GESTURE_WAVE,
+	GESTURE_POINT,
+	GESTURE_POINT_NO_PING,
+	GESTURE_MAX
+} gesture_type_t;
+
 /* =============================================================== */
 
 /* link_t is only used for entity area links now */
diff --git a/src/game/header/local.h b/src/game/header/local.h
index eecc2af1..3fdf2a2d 100644
--- a/src/game/header/local.h
+++ b/src/game/header/local.h
@@ -693,6 +693,7 @@ extern cvar_t *g_swap_speed;
 extern cvar_t *g_language;
 extern cvar_t *g_itemsbobeffect;
 extern cvar_t *g_start_items;
+extern cvar_t *ai_model_scale;
 extern cvar_t *g_game;
 
 /* this is for the count of monsters */
diff --git a/src/game/savegame/savegame.c b/src/game/savegame/savegame.c
index bde1befd..1d6435f7 100644
--- a/src/game/savegame/savegame.c
+++ b/src/game/savegame/savegame.c
@@ -267,6 +267,7 @@ InitGame(void)
 	g_itemsbobeffect = gi.cvar("g_itemsbobeffect", "0", CVAR_ARCHIVE);
 	g_game = gi.cvar("game", "", 0);
 	g_start_items = gi.cvar("g_start_items", "", 0);
+	ai_model_scale = gi.cvar("ai_model_scale", "0", 0);
 
 	/* initilize localization */
 	LocalizationInit();