diff --git a/Gameleap/mw4/Content/Mechs/Battlemaster/battlemaster.subsystems b/Gameleap/mw4/Content/Mechs/Battlemaster/battlemaster.subsystems
index 68406e73..0e9a8ea6 100644
--- a/Gameleap/mw4/Content/Mechs/Battlemaster/battlemaster.subsystems
+++ b/Gameleap/mw4/Content/Mechs/Battlemaster/battlemaster.subsystems
@@ -167,10 +167,90 @@ Model=Subsystems\HeatSinkSubsystem.data
 ExecutionState=NeverExecuteState
 InternalLocation=CenterTorso
 
-[MediumPulse1]
-Model=WeaponSubsystems\PulseLaserWeaponSubsystem\MediumPulseLaser.data
+[PPC1]
+Model=WeaponSubsystems\PPCWeaponSubsystem\PPC.data
 ExecutionState=NeverExecuteState
 CriticalHitsTaken=1
-Site=site_lbgunport
+Site=site_rdgunport
+GroupIndex=1
+InternalLocation=Special2
+
+[MediumLaser1]
+Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_rdtorsoport
+GroupIndex=1
+InternalLocation=RightTorso
+
+[MediumLaser2]
+Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_rdtorsoport
+GroupIndex=1
+InternalLocation=RightTorso
+
+[MediumLaser3]
+Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_rdtorsoport
+GroupIndex=1
+InternalLocation=RightTorso
+WeaponFacing=1
+
+[MediumLaser4]
+Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_ldtorsoport
+GroupIndex=1
+InternalLocation=LeftTorso
+
+[MediumLaser5]
+Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_ldtorsoport
+GroupIndex=1
+InternalLocation=LeftTorso
+
+[MediumLaser6]
+Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_ldtorsoport
+GroupIndex=1
+InternalLocation=LeftTorso
+WeaponFacing=1
+
+[MachineGun1]
+Model=WeaponSubsystems\MachineGunWeaponSubsystem\MachineGun.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_lagunport
+EjectSite=site_lagunport
 GroupIndex=1
 InternalLocation=LeftArm
+AmmoCount=200
+
+[MachineGun2]
+Model=WeaponSubsystems\MachineGunWeaponSubsystem\MachineGun.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_lagunport
+EjectSite=site_lagunport
+GroupIndex=1
+InternalLocation=LeftArm
+AmmoCount=200
+
+[SRM6_1]
+Model=WeaponSubsystems\SRMWeaponSubsystem\SRM6.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_missile
+GroupIndex=2
+InternalLocation=Special1
+AmmoCount=15
+
diff --git a/Gameleap/mw4/Content/Mechs/Battlemaster2c/battlemaster2c.subsystems b/Gameleap/mw4/Content/Mechs/Battlemaster2c/battlemaster2c.subsystems
index 392a15cb..70f2d427 100644
--- a/Gameleap/mw4/Content/Mechs/Battlemaster2c/battlemaster2c.subsystems
+++ b/Gameleap/mw4/Content/Mechs/Battlemaster2c/battlemaster2c.subsystems
@@ -167,10 +167,88 @@ Model=Subsystems\HeatSinkSubsystem.data
 ExecutionState=NeverExecuteState
 InternalLocation=CenterTorso
 
-[MediumPulse1]
-Model=WeaponSubsystems\PulseLaserWeaponSubsystem\ClanMediumPulseLaser.data
+[ERPPC1]
+Model=WeaponSubsystems\PPCWeaponSubsystem\ClanERPPC.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_ragunport
+GroupIndex=1
+InternalLocation=RightArm
+
+[ERMediumLaser1]
+Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_rdtorsoport
+GroupIndex=1
+InternalLocation=RightTorso
+
+[ERMediumLaser2]
+Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_rdtorsoport
+GroupIndex=1
+InternalLocation=RightTorso
+
+[ERMediumLaser3]
+Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_rdtorsoport
+GroupIndex=1
+InternalLocation=RightTorso
+WeaponFacing=1
+
+[ERMediumLaser4]
+Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_ldtorsoport
+GroupIndex=1
+InternalLocation=LeftTorso
+
+[ERMediumLaser5]
+Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_ldtorsoport
+GroupIndex=1
+InternalLocation=LeftTorso
+
+[ERMediumLaser6]
+Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_ldtorsoport
+GroupIndex=1
+InternalLocation=LeftTorso
+WeaponFacing=1
+
+[Gauss1]
+Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_lagunport
+GroupIndex=1
+InternalLocation=LeftArm
+AmmoCount=16
+
+[Gauss2]
+Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
 ExecutionState=NeverExecuteState
 CriticalHitsTaken=1
 Site=site_lbgunport
 GroupIndex=1
 InternalLocation=LeftArm
+AmmoCount=16
+
+[SSRM6_1]
+Model=WeaponSubsystems\SSRMWeaponSubsystem\ClanSSRM6.data
+ExecutionState=NeverExecuteState
+CriticalHitsTaken=1
+Site=site_missile
+GroupIndex=2
+InternalLocation=Special1
+AmmoCount=15
+
diff --git a/Gameleap/mw4/Content/Mechs/Behemoth/behemoth.subsystems b/Gameleap/mw4/Content/Mechs/Behemoth/behemoth.subsystems
index 3611da81..7abad642 100644
--- a/Gameleap/mw4/Content/Mechs/Behemoth/behemoth.subsystems
+++ b/Gameleap/mw4/Content/Mechs/Behemoth/behemoth.subsystems
@@ -185,7 +185,7 @@ InternalLocation=RightTorso
 Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
 ExecutionState=NeverExecuteState
 Site=site_lmgunport
-GroupIndex=3
+GroupIndex=1
 InternalLocation=LeftArm
 AmmoCount=16
 
@@ -193,7 +193,7 @@ AmmoCount=16
 Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
 ExecutionState=NeverExecuteState
 Site=site_rmgunport
-GroupIndex=3
+GroupIndex=1
 InternalLocation=RightArm
 AmmoCount=16
 
@@ -201,6 +201,6 @@ AmmoCount=16
 Model=WeaponSubsystems\LaserWeaponSubsystem\LargeLaser.data
 ExecutionState=NeverExecuteState
 Site=site_ctorsoport
-GroupIndex=3
+GroupIndex=1
 InternalLocation=Special1
 
diff --git a/Gameleap/mw4/Content/Mechs/Behemoth2/behemoth2.subsystems b/Gameleap/mw4/Content/Mechs/Behemoth2/behemoth2.subsystems
index 66e86d62..05425ffa 100644
--- a/Gameleap/mw4/Content/Mechs/Behemoth2/behemoth2.subsystems
+++ b/Gameleap/mw4/Content/Mechs/Behemoth2/behemoth2.subsystems
@@ -185,7 +185,7 @@ InternalLocation=RightTorso
 Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
 ExecutionState=NeverExecuteState
 Site=site_lmgunport
-GroupIndex=3
+GroupIndex=1
 InternalLocation=LeftArm
 AmmoCount=16
 
@@ -193,7 +193,7 @@ AmmoCount=16
 Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
 ExecutionState=NeverExecuteState
 Site=site_rmgunport
-GroupIndex=3
+GroupIndex=1
 InternalLocation=RightArm
 AmmoCount=16
 
@@ -201,6 +201,6 @@ AmmoCount=16
 Model=WeaponSubsystems\LaserWeaponSubsystem\LargeLaser.data
 ExecutionState=NeverExecuteState
 Site=site_ctorsoport
-GroupIndex=3
+GroupIndex=1
 InternalLocation=Special1
 
diff --git a/Gameleap/mw4/Content/ShellScripts/Multiplayer/ConLobbyMission.script b/Gameleap/mw4/Content/ShellScripts/Multiplayer/ConLobbyMission.script
index 2a8cc897..41592a71 100644
--- a/Gameleap/mw4/Content/ShellScripts/Multiplayer/ConLobbyMission.script
+++ b/Gameleap/mw4/Content/ShellScripts/Multiplayer/ConLobbyMission.script
@@ -39,7 +39,7 @@
 #define TIME_LIST_DEFAULT       $$g_nTimeList_Index$$ // 5 // 7 minutes
 #define TIME_VALUE_DEFAULT      $$g_nTimeList_Value$$ // 7 // 7 minutes
 #else // !DEMO_CODE
-#define TIME_LIST_COUNT         9  // MSL
+#define TIME_LIST_COUNT         18  // MSL // JPP array total
 #define TIME_LIST_DEFAULT       $$g_nTimeList_Index$$ // 3 // 7 minutes
 #define TIME_VALUE_DEFAULT      $$g_nTimeList_Value$$ // 7 // 7 minutes
 #endif // DEMO_CODE
@@ -283,14 +283,19 @@ main
 				o_game_options[i].offsetLabel					= drop_name_loc[i]									
 				o_game_options[i].arrowHeight					= 15
 
-				if i == 6
+				if i == 5
 				{
-					o_game_options[i].max_displayed				= 4
+					o_game_options[i].max_displayed				= 10
 				}
 				else
-				{
-					o_game_options[i].max_displayed				= 16
-				}
+					if i == 6
+					{
+						o_game_options[i].max_displayed				= 4
+					}
+					else
+					{
+						o_game_options[i].max_displayed				= 16
+					}
 			}
 			else
 			{
@@ -443,7 +448,7 @@ main
 				callback($$Shell_CallbackHandler$$, ShellSetTime, o_game_options[i].nselected)
 			}
 
-			if i == 5
+			if i == 5 //jpp add time list here
 			{	
 				o_game_options[i].list_item[0] = "1"
 				o_game_options[i].list_item[1] = "2"
@@ -460,13 +465,22 @@ main
 
                 o_game_options[i].nselected = TIME_LIST_DEFAULT
 #else // !DEMO_CODE
-				o_game_options[i].list_item[2] = "5"
-				o_game_options[i].list_item[3] = "7"
-				o_game_options[i].list_item[4] = "9"
-				o_game_options[i].list_item[5] = "10"
-				o_game_options[i].list_item[6] = "12"
-				o_game_options[i].list_item[7] = "15"
-				o_game_options[i].list_item[8] = "30"
+				o_game_options[i].list_item[2] = "3"
+				o_game_options[i].list_item[3] = "4"
+				o_game_options[i].list_item[4] = "5"
+				o_game_options[i].list_item[5] = "6"
+				o_game_options[i].list_item[6] = "7"
+				o_game_options[i].list_item[7] = "8"
+				o_game_options[i].list_item[8] = "9"
+				o_game_options[i].list_item[9] = "10"
+				o_game_options[i].list_item[10] = "11"
+				o_game_options[i].list_item[11] = "12"
+				o_game_options[i].list_item[12] = "13"
+				o_game_options[i].list_item[13] = "14"
+				o_game_options[i].list_item[14] = "15"
+				o_game_options[i].list_item[15] = "20"
+				o_game_options[i].list_item[16] = "25"
+				o_game_options[i].list_item[17] = "30"
 
 				if callback($$GetLocalNetworkMissionParamater$$, time_limit) == 0
 					o_game_options[i].nselected = TIME_LIST_DEFAULT
diff --git a/Gameleap/mw4/MW4pro.exe b/Gameleap/mw4/MW4pro.exe
index 971366ce..39bba333 100644
--- a/Gameleap/mw4/MW4pro.exe
+++ b/Gameleap/mw4/MW4pro.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8572c9a4a79b9d1f03c513dc67ba4ed68b5bea2e4ccf7b1cfe7fe89066a412e
+oid sha256:9fabb59ff48420c3eebfa507ee43a1429e9f8b622ebe8af595e757ad8f6dac21
 size 4386816
diff --git a/Gameleap/mw4/Resource/core.dep b/Gameleap/mw4/Resource/core.dep
index ab691300..99c69f8a 100644
Binary files a/Gameleap/mw4/Resource/core.dep and b/Gameleap/mw4/Resource/core.dep differ
diff --git a/Gameleap/mw4/Resource/core.mw4 b/Gameleap/mw4/Resource/core.mw4
index 54c67d0d..5ea0e892 100644
--- a/Gameleap/mw4/Resource/core.mw4
+++ b/Gameleap/mw4/Resource/core.mw4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36feab01476b89f21503cde9ce4a521efdd90421141ad0482e8ab4e4774c8072
-size 2306050
+oid sha256:3b0ff869ada102ab881d74dd963077e73a864ce9beaa5df5ac30d481fbc24a91
+size 2306605
diff --git a/Gameleap/mw4/Resource/props.dep b/Gameleap/mw4/Resource/props.dep
index 5cd6f15c..81bcb653 100644
Binary files a/Gameleap/mw4/Resource/props.dep and b/Gameleap/mw4/Resource/props.dep differ
diff --git a/Gameleap/mw4/Resource/props.mw4 b/Gameleap/mw4/Resource/props.mw4
index f7a93bc3..ed28d96f 100644
--- a/Gameleap/mw4/Resource/props.mw4
+++ b/Gameleap/mw4/Resource/props.mw4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c02968acd48c201cd323fa2df7c9926181c524c2d1df3a0f2a1b1d38c214401a
-size 113463584
+oid sha256:a46b4c49cb482a015c1a0146edc00179cee9758781e084d17ddc4c2d20d5166a
+size 113463827
diff --git a/MW4/Resource/core.mw4 b/MW4/Resource/core.mw4
index 54c67d0d..5ea0e892 100644
--- a/MW4/Resource/core.mw4
+++ b/MW4/Resource/core.mw4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36feab01476b89f21503cde9ce4a521efdd90421141ad0482e8ab4e4774c8072
-size 2306050
+oid sha256:3b0ff869ada102ab881d74dd963077e73a864ce9beaa5df5ac30d481fbc24a91
+size 2306605
diff --git a/MW4/Resource/props.mw4 b/MW4/Resource/props.mw4
index f7a93bc3..ed28d96f 100644
--- a/MW4/Resource/props.mw4
+++ b/MW4/Resource/props.mw4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c02968acd48c201cd323fa2df7c9926181c524c2d1df3a0f2a1b1d38c214401a
-size 113463584
+oid sha256:a46b4c49cb482a015c1a0146edc00179cee9758781e084d17ddc4c2d20d5166a
+size 113463827