diff --git a/Source/gs-entbase/server/ambient_generic.cpp b/Source/gs-entbase/server/ambient_generic.cpp
index 98728d02..3c29fd07 100644
--- a/Source/gs-entbase/server/ambient_generic.cpp
+++ b/Source/gs-entbase/server/ambient_generic.cpp
@@ -16,12 +16,14 @@ enumflags
 	AS_NOTTOGGLED
 };
 
-class ambient_generic : CBaseTrigger {
+class ambient_generic:CBaseTrigger
+{
 	string m_strActivePath;
 	string m_strSoundPath;
 	float m_flVolume;
 	float m_flRadius;
 	int m_iToggleSwitch;
+
 	float m_flPitch;
 	int m_iLoop;
 
@@ -30,100 +32,119 @@ class ambient_generic : CBaseTrigger {
 	float m_flFadeIn;
 	float m_flFadeOut;*/ // TODO: Do this in CSQC
 	void() ambient_generic;
+	
+	virtual void() Respawn;
+	virtual void() UseNormal;
+	virtual void() UseLoop;
+	virtual float(entity, float) Network;
 };
 
-static float ambient_generic::Network(entity ePEnt, float fChanged)
+float ambient_generic::Network(entity ePEnt, float fChanged)
 {
-	WriteByte( MSG_ENTITY, ENT_AMBIENTSOUND );
-	WriteCoord( MSG_ENTITY, origin[0] );
-	WriteCoord( MSG_ENTITY, origin[1] );
-	WriteCoord( MSG_ENTITY, origin[2] );
-	WriteString( MSG_ENTITY, m_strActivePath );
-	WriteFloat( MSG_ENTITY, m_flVolume );
-	WriteByte( MSG_ENTITY, m_flRadius );
-	WriteByte( MSG_ENTITY, m_iLoop );
-	WriteByte( MSG_ENTITY, 0 );
+	if (!m_iToggleSwitch) {
+		return FALSE;
+	}
+
+	WriteByte(MSG_ENTITY, ENT_AMBIENTSOUND);
+	WriteCoord(MSG_ENTITY, origin[0]);
+	WriteCoord(MSG_ENTITY, origin[1]);
+	WriteCoord(MSG_ENTITY, origin[2]);
+	WriteString(MSG_ENTITY, m_strActivePath);
+	WriteFloat(MSG_ENTITY, m_flVolume);
+	WriteByte(MSG_ENTITY, m_flRadius);
+	WriteByte(MSG_ENTITY, m_iLoop);
+	WriteByte(MSG_ENTITY, 0);
 	return TRUE;
 }
-void ambient_generic::UseNormal( void )
+
+void ambient_generic::UseNormal(void)
 {
 	sound(this, CHAN_VOICE, m_strActivePath, m_flVolume, m_flRadius, m_flPitch);
 }
-void ambient_generic::UseLoop( void )
+void ambient_generic::UseLoop(void)
 {
-	if ( m_iToggleSwitch == TRUE ) {
+	if (m_iToggleSwitch == TRUE) {
 		m_strActivePath = "common/null.wav";
-		SendFlags = 128;
-		m_iToggleSwitch = FALSE;
 	} else {
 		m_strActivePath = m_strSoundPath;
-		SendFlags = 128;
+	}
+	m_iToggleSwitch = 1 - m_iToggleSwitch;
+	SendFlags = 1;
+}
+
+void ambient_generic::Respawn(void)
+{
+	m_strActivePath = m_strSoundPath;
+
+	if (spawnflags & AS_NOTTOGGLED) {
+		Trigger = UseNormal;
+		m_iLoop = FALSE;
+	} else {
+		m_iLoop = TRUE;
+	}
+
+	if (spawnflags & AS_SILENT) {
+		m_iToggleSwitch = FALSE;
+	} else {
 		m_iToggleSwitch = TRUE;
 	}
+	
+	if (m_iLoop) {
+		pvsflags = PVSF_IGNOREPVS;
+		Trigger = UseLoop;
+		SendEntity = Network;
+		SendFlags = 1;
+	}
 }
 
-void ambient_generic::ambient_generic ( void )
+void ambient_generic::ambient_generic (void)
 {
-	for ( int i = 1; i < ( tokenize( __fullspawndata ) - 1 ); i += 2 ) {
-		switch ( argv( i ) ) {
+	for (int i = 1; i < (tokenize(__fullspawndata) - 1); i += 2) {
+		switch (argv(i)) {
 		case "message":
-			m_strSoundPath = argv( i + 1 );
+			m_strSoundPath = argv(i+1);
 			m_strActivePath = m_strSoundPath;
 			message = __NULL__;
 			break;
 		case "health":
-			m_flVolume = stof( argv( i + 1 ) ) * 0.1f;
+			m_flVolume = stof(argv(i+1)) * 0.1f;
 			health = __NULL__;
 			break;
 		case "volume":
-			m_flVolume = stof( argv( i + 1 ) );
+			m_flVolume = stof(argv(i+1));
 			//volume = __NULL__;
 			break;
 		case "pitch":
-			m_flPitch = stof( argv( i + 1 ) );
+			m_flPitch = stof(argv(i+1));
 			break;
 		default:
 			break;
 		}
 	}
 
-	if ( !m_strSoundPath ) {
-		objerror( "ambient_generic: No sound file specified. Aborting." );
+	if (!m_strSoundPath) {
+		objerror("ambient_generic: No sound file specified. Aborting.");
 	}
 
-	precache_sound( m_strSoundPath );
+	precache_sound(m_strSoundPath);
 
-	if ( !m_flVolume ) {
+	if (!m_flVolume) {
 		m_flVolume = 1.0f;
 	}
 
 	// There can be only one
-	if ( spawnflags & AS_ARADIUS ) {
+	if (spawnflags & AS_ARADIUS) {
 		m_flRadius = ATTN_NONE;
-	} else if ( spawnflags & AS_SRADIUS ) {
+	} else if (spawnflags & AS_SRADIUS) {
 		m_flRadius = ATTN_IDLE;
-	} else if ( spawnflags & AS_MRADIUS ) {
+	} else if (spawnflags & AS_MRADIUS) {
 		m_flRadius = ATTN_STATIC;
-	} else if ( spawnflags & AS_LRADIUS ) {
+	} else if (spawnflags & AS_LRADIUS) {
 		m_flRadius = ATTN_NORM;
 	} else {
 		m_flRadius = ATTN_STATIC;
 	}
 
-	if ( spawnflags & AS_NOTTOGGLED ) {
-		m_iLoop = FALSE;
-	} else {
-		m_iLoop = TRUE;
-	}
-
-	if( spawnflags & AS_SILENT ) {
-		Trigger = UseNormal;
-	} else {
-		pvsflags = PVSF_NOREMOVE | PVSF_IGNOREPVS;
-		Trigger = UseLoop;
-		SendEntity = Network;
-		m_iToggleSwitch = FALSE;
-	}
-
+	ambient_generic::Respawn();
 	CBaseTrigger::CBaseTrigger();
 }