diff --git a/sp/src/game/client/client_base.vpc b/sp/src/game/client/client_base.vpc
index 35302397..7799de51 100644
--- a/sp/src/game/client/client_base.vpc
+++ b/sp/src/game/client/client_base.vpc
@@ -189,6 +189,71 @@ $Project
 		$File	"$SRCDIR\game\shared\content_mounter.cpp"	
 		}
 		
+		//$Folder "Source ++"
+		//{
+			//$Folder	"Deferred"
+			//{
+				//$Folder "Shared"
+				//{
+					//$File	"$SRCDIR\game\shared\source++\deferred\CDefLight.cpp"
+					//$File	"$SRCDIR\game\shared\source++\deferred\CDefLight.h"
+					//$File	"$SRCDIR\game\shared\source++\deferred\CDefLightContainer.cpp"
+					//$File	"$SRCDIR\game\shared\source++\deferred\CDefLightContainer.h"
+					//$File	"$SRCDIR\game\shared\source++\deferred\CDefLightGlobal.cpp"
+					//$File	"$SRCDIR\game\shared\source++\deferred\CDefLightGlobal.h"
+					//$File	"$SRCDIR\game\shared\source++\deferred\deferred_shared_common.cpp"
+					//$File	"$SRCDIR\game\shared\source++\deferred\deferred_shared_common.h"
+					//$File	"$SRCDIR\game\shared\source++\deferred\ssemath_ext.h"
+				//}
+		
+				//$Folder "Client"
+				//{
+					//$Folder "VGUI"
+					//{
+						//$File	"source++\deferred\vgui\projectable_factory.cpp"
+						//$File	"source++\deferred\vgui\projectable_factory.h"
+						//$File	"source++\deferred\vgui\vgui_deferred.h"
+						//$File	"source++\deferred\vgui\vgui_editor_controls.cpp"
+						//$File	"source++\deferred\vgui\vgui_editor_controls.h"
+						//$File	"source++\deferred\vgui\vgui_editor_props.cpp"
+						//$File	"source++\deferred\vgui\vgui_editor_props.h"
+						//$File	"source++\deferred\vgui\vgui_editor_root.cpp"
+						//$File	"source++\deferred\vgui\vgui_marquee.cpp"
+						//$File	"source++\deferred\vgui\vgui_marquee.h"
+						//$File	"source++\deferred\vgui\vgui_particles.cpp"
+						//$File	"source++\deferred\vgui\vgui_particles.h"
+						//$File	"source++\deferred\vgui\vgui_projectable.cpp"
+						//$File	"source++\deferred\vgui\vgui_projectable.h"
+					//}
+			
+					//$File	"source++\deferred\cascade_t.h"
+					//$File	"source++\deferred\cascade_t.cpp"
+					//$File	"source++\deferred\cdeferred_manager_client.cpp"
+					//$File	"source++\deferred\cdeferred_manager_client.h"
+					//$File	"source++\deferred\clight_manager.cpp"
+					//$File	"source++\deferred\clight_manager.h"
+					//$File	"source++\deferred\def_light_t.cpp"
+					//$File	"source++\deferred\def_light_t.h"
+					//$File	"source++\deferred\DefCookieProjectable.cpp"
+					//$File	"source++\deferred\DefCookieProjectable.h"
+					//$File	"source++\deferred\DefCookieTexture.cpp"
+					//$File	"source++\deferred\DefCookieTexture.h"
+					//$File	"source++\deferred\deferred_client_common.cpp"
+					//$File	"source++\deferred\deferred_client_common.h"
+					//$File	"source++\deferred\deferred_rt.cpp"
+//					$File	"source++\deferred\deferred_rt.h"
+//					$File	"source++\deferred\flashlighteffect_deferred.cpp"
+//					$File	"source++\deferred\flashlighteffect_deferred.h"
+//					$File	"source++\deferred\IDefCookie.h"
+//					$File	"source++\deferred\IDeferredExtClient.cpp"
+//					$File	"source++\deferred\materialsystem_passthru.cpp"
+//					$File	"source++\deferred\materialsystem_passthru.h"
+//					$File	"source++\deferred\viewrender_deferred.cpp"
+//					$File	"source++\deferred\viewrender_deferred.h"
+//				}
+	//		}
+//		}
+		
 		//$File	"c_env_cascade_light.cpp"
 		//$File	"C_Env_Cascade_Light.h"
 		$File	"hl2\C_Func_Monitor.cpp"
diff --git a/sp/src/game/server/bcws/weapon_pipe.cpp b/sp/src/game/server/bcws/weapon_pipe.cpp
index b2bbcbc2..2bd94382 100644
--- a/sp/src/game/server/bcws/weapon_pipe.cpp
+++ b/sp/src/game/server/bcws/weapon_pipe.cpp
@@ -461,7 +461,7 @@ void CWeaponPipe::Swing(int bIsSecondary)
 
 	//Setup our next attack times
 	m_flNextPrimaryAttack = gpGlobals->curtime + GetFireRate();
-	m_flNextSecondaryAttack = gpGlobals->curtime + SequenceDuration();
+	m_flNextSecondaryAttack = gpGlobals->curtime + 2;
 
 #ifndef MAPBASE
 	//Play swing sound
@@ -487,25 +487,24 @@ void CWeaponPipe::ItemPostFrame()
 	{
 		SendWeaponAnim(ACT_VM_HITCENTER2_START);
 		AtkPressStart = gpGlobals->curtime;
-		m_flNextPrimaryAttack = gpGlobals->curtime + 999999999;
+		m_flNextPrimaryAttack = gpGlobals->curtime + 100;
 	}
 
 	//On Mouse2 released
 	if (pOwner->m_afButtonReleased & IN_ATTACK2)
 	{
+		m_flNextPrimaryAttack = 0;
 		AtkPressEnd = gpGlobals->curtime;
-		if (AtkPressEnd - AtkPressStart < 0.6)
+		AtkDifference = AtkPressEnd - AtkPressStart;
+		if (AtkDifference < 0.6f)
 		{
 			SendWeaponAnim(ACT_VM_IDLE);
 			return;
 		}
-		else if (AtkPressEnd - AtkPressStart > 3)
+		else if (AtkDifference > 3)
 			AtkDifference = 3;
-		else
-			AtkDifference = AtkPressEnd - AtkPressStart;
-
-
-
+		
+		
 		SendWeaponAnim(ACT_VM_HITCENTER2_END);
 		Swing(true);
 		//Msg("Delay is: %f\n", AtkDifference);
diff --git a/sp/src/vgui2/vgui_controls/Debug/vc120.pdb b/sp/src/vgui2/vgui_controls/Debug/vc120.pdb
index b9628c4d..23cdb8d6 100644
Binary files a/sp/src/vgui2/vgui_controls/Debug/vc120.pdb and b/sp/src/vgui2/vgui_controls/Debug/vc120.pdb differ