diff --git a/cl_dll/CMakeLists.txt b/cl_dll/CMakeLists.txt
index 7966531f..f972c113 100644
--- a/cl_dll/CMakeLists.txt
+++ b/cl_dll/CMakeLists.txt
@@ -31,14 +31,14 @@ set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
 set (CLDLL_SOURCES 
 #	../dlls/crossbow.cpp 
 	../dlls/crowbar.cpp 
-#	../dlls/egon.cpp 
+	../dlls/egon.cpp 
 #	../dlls/gauss.cpp 
-#	../dlls/handgrenade.cpp 
+	../dlls/handgrenade.cpp 
 #	../dlls/hornetgun.cpp 
 #	../dlls/mp5.cpp 
 #	../dlls/python.cpp 
 #	../dlls/rpg.cpp 
-#	../dlls/satchel.cpp 
+	../dlls/satchel.cpp 
 #	../dlls/shotgun.cpp 
 #	../dlls/squeakgrenade.cpp 
 	../dlls/tripmine.cpp 
diff --git a/cl_dll/hl/hl_weapons.cpp b/cl_dll/hl/hl_weapons.cpp
index 150c8db3..597695c4 100644
--- a/cl_dll/hl/hl_weapons.cpp
+++ b/cl_dll/hl/hl_weapons.cpp
@@ -61,9 +61,9 @@ CMP5 g_Mp5;
 CCrossbow g_Crossbow;
 CShotgun g_Shotgun;
 CRpg g_Rpg;
-CGauss g_Gauss;
+CGauss g_Gauss;*/
 CEgon g_Egon;
-CHgun g_HGun;*/
+//CHgun g_HGun;
 CHandGrenade g_HandGren;
 CSatchel g_Satchel;
 CTripmine g_Tripmine;
@@ -631,9 +631,9 @@ void HUD_InitClientWeapons( void )
 	HUD_PrepEntity( &g_Crossbow, &player );
 	HUD_PrepEntity( &g_Shotgun, &player );
 	HUD_PrepEntity( &g_Rpg, &player );
-	HUD_PrepEntity( &g_Gauss, &player );
+	HUD_PrepEntity( &g_Gauss, &player );*/
 	HUD_PrepEntity( &g_Egon, &player );
-	HUD_PrepEntity( &g_HGun, &player );*/
+	//HUD_PrepEntity( &g_HGun, &player );
 	HUD_PrepEntity( &g_HandGren, &player );
 	HUD_PrepEntity( &g_Satchel, &player );
 	HUD_PrepEntity( &g_Tripmine, &player );
@@ -724,11 +724,11 @@ void HUD_WeaponsPostThink( local_state_s *from, local_state_s *to, usercmd_t *cm
 			break;
 		case WEAPON_GAUSS:
 			pWeapon = &g_Gauss;
-			break;
+			break;*/
 		case WEAPON_EGON:
 			pWeapon = &g_Egon;
 			break;
-		case WEAPON_HORNETGUN:
+		/*case WEAPON_HORNETGUN:
 			pWeapon = &g_HGun;
 			break;*/
 		case WEAPON_HANDGRENADE:
diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt
index ef79c330..4f50afc6 100644
--- a/dlls/CMakeLists.txt
+++ b/dlls/CMakeLists.txt
@@ -51,7 +51,7 @@ set (SVDLL_SOURCES
 	defaultai.cpp
 	doors.cpp
 	effects.cpp
-#	egon.cpp
+	egon.cpp
 	explode.cpp
 	flyingmonster.cpp
 	func_break.cpp
@@ -137,7 +137,7 @@ set (SVDLL_SOURCES
 	coldice/ashotgun.cpp
 	coldice/cluster_grenade.cpp
 	coldice/mac_10.cpp
-	coldice/railgun.cpp
+#	coldice/railgun.cpp
 	coldice/sword.cpp
 	coldice/boltgun.cpp
 	coldice/double_uzi.cpp
diff --git a/dlls/egon.cpp b/dlls/egon.cpp
index 433704ce..5c63f70d 100644
--- a/dlls/egon.cpp
+++ b/dlls/egon.cpp
@@ -49,7 +49,8 @@ enum egon_e {
 	EGON_HOLSTER
 };
 
-LINK_ENTITY_TO_CLASS( weapon_egon, CEgon )
+LINK_ENTITY_TO_CLASS( weapon_railgun, CEgon )
+LINK_ENTITY_TO_CLASS( weapon_gauss, CEgon )
 
 void CEgon::Spawn()
 {
@@ -57,7 +58,7 @@ void CEgon::Spawn()
 	m_iId = WEAPON_EGON;
 	SET_MODEL( ENT( pev ), "models/w_egon.mdl" );
 
-	m_iDefaultAmmo = EGON_DEFAULT_GIVE;
+	m_iDefaultAmmo = RAILGUN_DEFAULT_GIVE;
 
 	FallInit();// get ready to fall down.
 }
@@ -114,16 +115,16 @@ void CEgon::Holster( int skiplocal /* = 0 */ )
 int CEgon::GetItemInfo( ItemInfo *p )
 {
 	p->pszName = STRING( pev->classname );
-	p->pszAmmo1 = "uranium";
-	p->iMaxAmmo1 = URANIUM_MAX_CARRY;
+	p->pszAmmo1 = "slug";
+	p->iMaxAmmo1 = RAILGUN_MAX_CARRY;
 	p->pszAmmo2 = NULL;
 	p->iMaxAmmo2 = -1;
 	p->iMaxClip = WEAPON_NOCLIP;
 	p->iSlot = 3;
 	p->iPosition = 2;
-	p->iId = m_iId = WEAPON_EGON;
+	p->iId = m_iId = WEAPON_RAILGUN;
 	p->iFlags = 0;
-	p->iWeight = EGON_WEIGHT;
+	p->iWeight = RAILGUN_WEIGHT;
 
 	return 1;
 }
diff --git a/dlls/skill.h b/dlls/skill.h
index be887fb5..bd62fe80 100644
--- a/dlls/skill.h
+++ b/dlls/skill.h
@@ -102,7 +102,8 @@ struct skilldata_t
 	float plrDmgClusterGrenade;
 	float plrDmgRocket;
 	float plrDmgRailgun;
-	float plrDmgPulse;
+	float plrDmgEgonNarrow;
+	float plrDmgEgonWide;
 	float plrDmgHandGrenade;
 	float plrDmgSatchel;
 	float plrDmgTripmine;
diff --git a/dlls/weapons.cpp b/dlls/weapons.cpp
index 03c0b6a0..ffea572c 100644
--- a/dlls/weapons.cpp
+++ b/dlls/weapons.cpp
@@ -1665,7 +1665,7 @@ TYPEDESCRIPTION	CGauss::m_SaveData[] =
 };
 
 IMPLEMENT_SAVERESTORE( CGauss, CBasePlayerWeapon )
-
+*/
 TYPEDESCRIPTION	CEgon::m_SaveData[] =
 {
 	//DEFINE_FIELD( CEgon, m_pBeam, FIELD_CLASSPTR ),
@@ -1679,7 +1679,7 @@ TYPEDESCRIPTION	CEgon::m_SaveData[] =
 };
 
 IMPLEMENT_SAVERESTORE( CEgon, CBasePlayerWeapon )
-*/
+
 TYPEDESCRIPTION	CSatchel::m_SaveData[] = 
 {
 	DEFINE_FIELD( CSatchel, m_chargeReady, FIELD_INTEGER ),
diff --git a/dlls/weapons.h b/dlls/weapons.h
index afe31048..47752c0f 100644
--- a/dlls/weapons.h
+++ b/dlls/weapons.h
@@ -824,7 +824,7 @@ private:
 	unsigned short m_usGaussFire;
 	unsigned short m_usGaussSpin;
 };
-
+*/
 class CEgon : public CBasePlayerWeapon
 {
 public:
@@ -888,7 +888,7 @@ private:
 
 	unsigned short m_usEgonFire;
 };
-
+/*
 class CHgun : public CBasePlayerWeapon
 {
 public: