diff --git a/DATA/EQUIPMENT/market_misc.ini b/DATA/EQUIPMENT/market_misc.ini
index 33402746..80df9277 100644
--- a/DATA/EQUIPMENT/market_misc.ini
+++ b/DATA/EQUIPMENT/market_misc.ini
@@ -16886,3 +16886,57 @@ MarketGood = shield03_mark01_lf, 0, -1, 1, 1, 0, 1, 1
 MarketGood = shield03_mark02_fr, 0, -1, 1, 1, 0, 1, 1
 MarketGood = shield03_mark02_hf, 0, -1, 1, 1, 0, 1, 1
 MarketGood = shield03_mark02_lf, 0, -1, 1, 1, 0, 1, 1
+
+[BaseGood]
+base = LI06_03_Base
+MarketGood = ge_s_repair_01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = ge_s_tractor_01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = ge_s_cm_01_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = ge_s_cm_01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = ge_s_cm_02, 0, -1, 1, 1, 0, 1, 1
+MarketGood = ge_s_cm_02_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = ge_s_battery_01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = pi_fighter_power01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = pi_freighter_power01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine01_mark01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine01_mark01_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine01_mark02, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine01_mark02_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine01_mark03, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine01_mark03_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine02_mark01_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine02_mark02_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine02_mark03_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine02_mark04_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine02_mark05_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine01_mark05_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = mine01_mark04_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile01_mark01_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile01_mark02_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile01_mark03_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile01_mark04_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile01_mark05_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile02_mark01_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile02_mark02_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile02_mark03_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile02_mark04_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile02_mark05_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile03_mark01_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile03_mark02_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile03_mark03_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile03_mark04_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile01_mark02, 0, -1, 1, 1, 0, 1, 1
+MarketGood = missile01_mark03, 0, -1, 1, 1, 0, 1, 1
+MarketGood = fc_lr_turret01_mark01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = fc_lr_gun01_mark01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = fc_lr_gun01_mark02, 0, -1, 1, 1, 0, 1, 1
+MarketGood = cruise_disruptor01_mark01_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = cruise_disruptor01_mark02_ammo, 0, -1, 1, 1, 0, 1, 1
+MarketGood = cruise_disruptor01_mark01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = ge_s_thruster_01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = ge_s_thruster_02, 0, -1, 1, 1, 0, 1, 1
+MarketGood = shield01_mark01_fr, 0, -1, 1, 1, 0, 1, 1
+MarketGood = shield01_mark01_hf, 0, -1, 1, 1, 0, 1, 1
+MarketGood = shield01_mark01_lf, 0, -1, 1, 1, 0, 1, 1
+MarketGood = shield02_mark02_lf, 0, -1, 1, 1, 0, 1, 1
+MarketGood = shield02_mark03_fr, 0, -1, 1, 1, 0, 1, 1
diff --git a/DATA/MISSIONS/mbases.ini b/DATA/MISSIONS/mbases.ini
index 89dc800c..c118a3c7 100644
--- a/DATA/MISSIONS/mbases.ini
+++ b/DATA/MISSIONS/mbases.ini
@@ -46884,12 +46884,103 @@ fixture = LI0602_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors
 
 [MBase]
 nickname = LI06_03_Base
-local_faction = gd_z_grp
-diff = 4
+local_faction = fc_lr_grp
+diff = 1
 msg_id_prefix = gcs_refer_base_LI06_03_Base
 
 [MVendor]
-num_offers = 2, 4
+num_offers = 0, 0
+
+[GF_NPC]
+nickname = LI0603_fix_ship
+body = pi_pirate8_body
+head = pi_pirate3_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 263026
+affiliation = fc_lr_grp
+voice = rvp106
+
+[GF_NPC]
+nickname = li06_03_base_bar_npc_01
+body = pi_pirate2_body
+head = pl_male7_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = fc_lr_grp
+voice = rvp101
+individual_name = 263020
+
+[GF_NPC]
+nickname = li06_03_base_bar_npc_02
+body = pi_pirate2_body
+head = rh_captain_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = fc_lr_grp
+voice = rvp151
+individual_name = 263021
+
+[GF_NPC]
+nickname = li06_03_base_bar_npc_03
+body = pi_pirate2_body
+head = rh_sales_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = fc_lr_grp
+voice = rvp151
+accessory = prop_neuralnet_C_right
+individual_name = 263022
+
+[GF_NPC]
+nickname = li06_03_base_bar_npc_04
+body = pi_pirate2_body
+head = sc_scientist1_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = fc_lr_grp
+voice = rvp101
+individual_name = 263023
+
+[GF_NPC]
+nickname = li06_03_base_deck_npc_01
+body = pi_pirate2_body
+head = pl_male2_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = fc_lr_grp
+voice = rvp151
+individual_name = 263024
+
+[GF_NPC]
+nickname = li06_03_base_deck_npc_02
+body = pi_pirate2_body
+head = rh_hassler_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = fc_lr_grp
+voice = rvp106
+individual_name = 263025
+
+[MRoom]
+nickname = Bar
+character_density = 7
+fixture = li06_03_base_bar_npc_01, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender
+
+[MRoom]
+nickname = Deck
+character_density = 3
+fixture = li06_03_base_deck_npc_01, Zs/NPC/trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
+fixture = li06_03_base_deck_npc_02, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
+
+[MRoom]
+nickname = Deck2
+character_density = 3
+
+[MRoom]
+nickname = ShipDealer
+character_density = 2
+fixture = LI0603_fix_ship, Zs/NPC/ShipDealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
 
 [BaseFaction]
 faction = gd_z_grp
@@ -46917,65 +47008,6 @@ faction = fc_j_grp
 weight = 1
 offers_missions = false
 
-[GF_NPC]
-nickname = LI0603_fix_bartender
-body = pi_pirate8_body
-head = br_sales_head
-lefthand = benchmark_male_hand_left
-righthand = benchmark_male_hand_right
-individual_name = 244639
-affiliation = gd_z_grp
-voice = rvp101
-bribe = fc_j_grp, 10000, 16100
-bribe = fc_lr_grp, 10000, 16101
-bribe = fc_ou_grp, 10000, 16100
-
-[GF_NPC]
-nickname = LI0603_fix_ship
-body = pi_pirate8_body
-head = pi_pirate3_head
-lefthand = benchmark_male_hand_left
-righthand = benchmark_male_hand_right
-individual_name = 245175
-affiliation = gd_z_grp
-voice = rvp106
-
-[GF_NPC]
-nickname = LI0603_fix_trader
-body = pi_pirate8_body
-head = pi_pirate2_head
-lefthand = benchmark_male_hand_left
-righthand = benchmark_male_hand_right
-individual_name = 244640
-affiliation = gd_z_grp
-voice = rvp101
-
-[GF_NPC]
-nickname = LI0603_fix_weaponsdealer
-body = pi_pirate8_body
-head = pi_pirate4_head
-lefthand = benchmark_male_hand_left
-righthand = benchmark_male_hand_right
-individual_name = 244641
-affiliation = gd_z_grp
-voice = rvp106
-
-[MRoom]
-nickname = bar
-character_density = 5
-fixture = LI0603_fix_bartender, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender
-
-[MRoom]
-nickname = Deck
-character_density = 2
-fixture = LI0603_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
-fixture = LI0603_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
-
-[MRoom]
-nickname = ShipDealer
-character_density = 2
-fixture = LI0603_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
-
 [MBase]
 nickname = LI06_04_Base
 local_faction = li_lsf_grp
diff --git a/DATA/SOLAR/ASTEROIDS/LI06_asteroid_001.ini b/DATA/SOLAR/ASTEROIDS/LI06_asteroid_001.ini
new file mode 100644
index 00000000..12050157
--- /dev/null
+++ b/DATA/SOLAR/ASTEROIDS/LI06_asteroid_001.ini
@@ -0,0 +1,75 @@
+[TexturePanels]
+file = solar\asteroids\rock_shapes.ini
+
+[Field]
+cube_size = 300
+fill_dist = 3200
+diffuse_color = 255, 255, 255
+ambient_color = 140, 140, 140
+ambient_increase = 90, 60, 30
+empty_cube_frequency = 0.4
+
+[properties]
+flag = lava_objects
+flag = Object_density_low
+
+[Cube]
+asteroid = lava02_asteroid30, 0.2, 0.8, 0.3, 45, 20, 45
+asteroid = lava02_asteroid10, 0.5, -0.3, -0.8, 10, 0, -40
+asteroid = lava02_asteroid30, -0.1, -0.3, 0.8, 30, 0, -70
+asteroid = lava02_asteroid10, 0.7, 0.4, -0.4, 75, 30, 120
+asteroid = lava02_asteroid30, -0.8, -0.3, 0.5, 30, 0, -70
+
+[AsteroidBillboards]
+count = 600
+start_dist = 1800
+fade_dist_percent = 0.5
+shape = asteroid_lava02
+color_shift = 1, 1, 1
+ambient_intensity = 1
+size = 10, 50
+
+[DynamicAsteroids]
+asteroid = DAsteroid_lava02
+count = 20
+placement_radius = 120
+placement_offset = 90
+max_velocity = 10
+max_angular_velocity = 3
+color_shift = 1, 1, 1
+
+[ExclusionBand]
+zone = Zone_Bw04_sun_death
+render_parts = 12
+shape = asteroid_belt_04
+height = 800
+offset_dist = -300
+fade = 1, 1.5, 15, 18
+texture_aspect = 1
+color_shift = 0, 0, 0
+ambient_intensity = 1
+cull_mode = 0
+vert_increase = 2
+
+[Band]
+render_parts = 12
+shape = asteroid_belt_04
+height = 800
+offset_dist = 300
+fade = 0.8, 1.25, 15, 17
+texture_aspect = 1
+color_shift = 0, 0, 0
+ambient_intensity = 0.4
+vert_increase = 2
+
+[LootableZone]
+asteroid_loot_container = lootcrate_ast_loot_diamonds
+asteroid_loot_commodity = commodity_diamonds
+dynamic_loot_container = lootcrate_ast_loot_diamonds
+dynamic_loot_commodity = commodity_diamonds
+asteroid_loot_count = 0, 0
+dynamic_loot_count = 1, 1
+asteroid_loot_difficulty = 30
+dynamic_loot_difficulty = 6
+
+; Copied by FL Atlas from file: solar\ASTEROIDS\bw04_von_rohe_lava_asteroids.ini
diff --git a/DATA/SOLAR/ASTEROIDS/LI06_debris_001.ini b/DATA/SOLAR/ASTEROIDS/LI06_debris_001.ini
new file mode 100644
index 00000000..ed916037
--- /dev/null
+++ b/DATA/SOLAR/ASTEROIDS/LI06_debris_001.ini
@@ -0,0 +1,76 @@
+[TexturePanels]
+file = solar\asteroids\debris_shapes.ini
+
+[Field]
+cube_size = 400
+fill_dist = 3000
+diffuse_color = 100, 100, 80
+ambient_color = 255, 255, 255
+ambient_increase = 20, 20, 30
+empty_cube_frequency = 0.4
+contains_fog_zone = true
+
+[properties]
+flag = object_density_medium
+flag = debris_objects
+
+[Cube]
+asteroid = debris_large3, 0.6, 0.2, -0.2, 35, 10, 20
+asteroid = debris_med1, -0.7, 0.3, 0.2, 0, 20, 190
+asteroid = debris_med2, 0.4, -0.8, -0.2, 15, 90, 120
+asteroid = debris_large1, -0.2, -0.1, -0.6, 105, 160, 25
+asteroid = debris_small2, 0, -0.8, -0.8, 35, 110, 60
+
+[Band]
+render_parts = 8
+shape = debris_belt_04
+height = 7000
+offset_dist = 3500
+fade = 1, 1.35, 10, 11
+texture_aspect = 1.5
+color_shift = 1, 1, 1
+ambient_intensity = 1
+vert_increase = 2
+
+[ExclusionBand]
+zone = Zone_Li01_005_Planet_Li01_02
+render_parts = 12
+shape = debris_belt_04
+height = 3000
+offset_dist = -500
+fade = 1, 1.5, 15, 18
+texture_aspect = 1
+color_shift = 1, 1, 1
+ambient_intensity = 1
+cull_mode = 0
+vert_increase = 2
+
+[AsteroidBillboards]
+count = 300
+start_dist = 1800
+fade_dist_percent = 0.5
+shape = debris_tri
+color_shift = 1, 1, 1
+ambient_intensity = 1
+size = 70, 160
+
+[DynamicAsteroids]
+asteroid = dasteroid_debris_small1
+count = 10
+placement_radius = 150
+placement_offset = 90
+max_velocity = 10
+max_angular_velocity = 3
+color_shift = 1, 1, 1
+
+[LootableZone]
+asteroid_loot_container = lootcrate_ast_loot_metal
+asteroid_loot_commodity = commodity_scrap_metal
+dynamic_loot_container = lootcrate_ast_loot_metal
+dynamic_loot_commodity = commodity_scrap_metal
+asteroid_loot_count = 0, 0
+dynamic_loot_count = 1, 1
+asteroid_loot_difficulty = 40
+dynamic_loot_difficulty = 4
+
+; Copied by FL Atlas from file: solar\ASTEROIDS\li01_pittsburgh_debris_field_001.ini
diff --git a/DATA/SOLAR/ASTEROIDS/LI06_mojavedustcloud_01.ini b/DATA/SOLAR/ASTEROIDS/LI06_mojavedustcloud_01.ini
index 2ece394c..fea7d87a 100644
--- a/DATA/SOLAR/ASTEROIDS/LI06_mojavedustcloud_01.ini
+++ b/DATA/SOLAR/ASTEROIDS/LI06_mojavedustcloud_01.ini
@@ -69,9 +69,6 @@ exclude_billboards = 1
 exclude_dynamic_asteroids = 1
 
 exclusion = Zone_LI06_to_LI07_hole
-exclusion = Zone_LI06_mojavedustcloud_01_exclusion_1
-exclude_billboards = 1
-exclude_dynamic_asteroids = 1
 
 [DynamicAsteroids]
 asteroid = DAsteroid_lava02
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_03_Base.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_03_Base.ini
index 0f739fc9..0a01c810 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_03_Base.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_03_Base.ini
@@ -1,6 +1,7 @@
 [BaseInfo]
 nickname = LI06_03_Base
-start_room = Bar
+start_room = Deck
+price_variance = 0.15
 
 [Room]
 nickname = Bar
@@ -9,11 +10,3 @@ file = Universe\Systems\LI06\Bases\Rooms\LI06_03_bar.ini
 [Room]
 nickname = Deck
 file = Universe\Systems\LI06\Bases\Rooms\LI06_03_deck.ini
-
-[Room]
-nickname = Deck2
-file = Universe\Systems\LI06\Bases\Rooms\LI06_03_deck2.ini
-
-[Room]
-nickname = ShipDealer
-file = Universe\Systems\LI06\Bases\Rooms\LI06_03_shipdealer.ini
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_bar.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_bar.ini
index 487e8b55..8ac06ecb 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_bar.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_bar.ini
@@ -1,20 +1,21 @@
 [Room_Info]
-set_script = scripts\bases\li_09_Bar_hardpoint_R6.thn
-scene = ambient, scripts\bases\li_09_bar_ambi_Li01_12.thn
-scene = ambient, scripts\bases\Ambi_Terrain_Static_Badlands.thn
-scene = ambient, scripts\bases\Ambi_Terrain_Dynamic_Badlands.thn
-scene = ambient, scripts\bases\Ambi_Lightning.thn
+set_script = scripts\bases\rh_08_Bar_hardpoint_R6.thn
+scene = ambient, scripts\bases\rh_08_bar_ambi_Bw04_02.thn
+scene = ambient, scripts\bases\Ambi_Terrain_Static_D01.thn
+scene = ambient, scripts\bases\Ambi_Terrain_Static_D02.thn
+scene = ambient, scripts\bases\Ambi_Terrain_Dynamic.thn
+scene = ambient, scripts\bases\Ambi_Terrain_Distant.thn
 
 [Room_Sound]
-music = music_bar_generic07
-ambient = ambience_bar_space
-
-[Camera]
-name = Camera_0
+music = music_bar_generic01
+ambient = ambience_deck_space_smaller
 
 [CharacterPlacement]
 name = Zg/PC/Player/01/A/Stand
-start_script = Scripts\Bases\br_08_bar_enter_01.thn
+start_script = Scripts\Bases\rh_08_bar_enter_01.thn
+
+[Camera]
+name = Camera_0
 
 [Hotspot]
 name = IDS_HOTSPOT_DECK
@@ -38,11 +39,6 @@ behavior = ExitDoor
 room_switch = Deck
 set_virtual_room = Equipment
 
-[Hotspot]
-name = IDS_HOTSPOT_SHIPDEALER_ROOM
-behavior = ExitDoor
-room_switch = ShipDealer
-
 [Hotspot]
 name = IDS_HOTSPOT_NEWSVENDOR
 behavior = NewsVendor
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck.ini
index ad3117cc..acda390a 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck.ini
@@ -1,17 +1,11 @@
 [Room_Info]
-scene = all, ambient, Scripts\Bases\br_05_Deck_ambi_int_01.thn
-set_script = Scripts\Bases\br_05_Deck_hardpoint_01.thn
-
-[Spiels]
-CommodityDealer = manhattan_commodity_spiel
-EquipmentDealer = manhattan_equipment_spiel
+set_script = Scripts\Bases\rh_07_Deck_hardpoint_01.thn
+scene = all, ambient, Scripts\Bases\rh_07_Deck_ambi_int_01.thn
+animation = Sc_loop
 
 [Room_Sound]
 ambient = ambience_deck_space_larger
 
-[CharacterPlacement]
-name = Zg/PC/Player/01/A/Stand
-
 [PlayerShipPlacement]
 name = X/Shipcentre/01
 
@@ -38,11 +32,6 @@ name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
 behavior = VirtualRoom
 room_switch = Equipment
 
-[Hotspot]
-name = IDS_HOTSPOT_SHIPDEALER_ROOM
-behavior = ExitDoor
-room_switch = ShipDealer
-
 [Hotspot]
 name = IDS_NN_REPAIR_YOUR_SHIP
 behavior = Repair
@@ -87,91 +76,3 @@ virtual_room = Equipment
 name = IDS_NN_REPAIR_YOUR_SHIP
 behavior = Repair
 virtual_room = Equipment
-
-[FlashlightSet]
-icolor = 255, 200, 100
-scale = 0.500000
-gap = 0.000000
-blink = 0.050000
-endpause = 0.000000
-hardpoint = HpLightA01
-hardpoint = HpLightA02
-hardpoint = HpLightA03
-hardpoint = HpLightA04
-hardpoint = HpLightA05
-hardpoint = HpLightA06
-hardpoint = HpLightA07
-hardpoint = HpLightA08
-hardpoint = HpLightA09
-hardpoint = HpLightA10
-hardpoint = HpLightA11
-hardpoint = HpLightA12
-hardpoint = HpLightA13
-hardpoint = HpLightA14
-hardpoint = HpLightA15
-hardpoint = HpLightA16
-hardpoint = HpLightA17
-hardpoint = HpLightA18
-hardpoint = HpLightA19
-hardpoint = HpLightA20
-hardpoint = HpLightA21
-hardpoint = HpLightA22
-hardpoint = HpLightA23
-hardpoint = HpLightA24
-hardpoint = HpLightA25
-hardpoint = HpLightA26
-hardpoint = HpLightA27
-hardpoint = HpLightA28
-hardpoint = HpLightA29
-hardpoint = HpLightA30
-hardpoint = HpLightB15
-hardpoint = HpLightB16
-hardpoint = HpLightB17
-hardpoint = HpLightB18
-hardpoint = HpLightB19
-hardpoint = HpLightB20
-hardpoint = HpLightB21
-hardpoint = HpLightB22
-hardpoint = HpLightB23
-hardpoint = HpLightB24
-hardpoint = HpLightB25
-hardpoint = HpLightB26
-
-[FlashlightSet]
-icolor = 200, 255, 50
-scale = 0.500000
-gap = 0.000000
-blink = 0.000000
-endpause = 0.000000
-hardpoint = HpLightA31
-hardpoint = HpLightA32
-hardpoint = HpLightA33
-hardpoint = HpLightA34
-hardpoint = HpLightA35
-hardpoint = HpLightA36
-hardpoint = HpLightA37
-hardpoint = HpLightA38
-hardpoint = HpLightA39
-hardpoint = HpLightA40
-
-[FlashlightSet]
-icolor = 100, 200, 200
-scale = 0.500000
-gap = 0.000000
-blink = 0.000000
-endpause = 0.000000
-numlights = 26
-hardpoint = HpLightB01
-hardpoint = HpLightB02
-hardpoint = HpLightB03
-hardpoint = HpLightB04
-hardpoint = HpLightB05
-hardpoint = HpLightB06
-hardpoint = HpLightB07
-hardpoint = HpLightB08
-hardpoint = HpLightB09
-hardpoint = HpLightB10
-hardpoint = HpLightB11
-hardpoint = HpLightB12
-hardpoint = HpLightB13
-hardpoint = HpLightB14
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck2.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck2.ini
index 250eea9e..e5dda994 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck2.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck2.ini
@@ -11,16 +11,31 @@ name = X/Shipcentre/01
 [Camera]
 name = Camera_0
 
-[Hotspot]
-name = IDS_HOTSPOT_DECK
-behavior = ExitDoor
-room_switch = Deck
-
 [Hotspot]
 name = IDS_HOTSPOT_BAR
 behavior = ExitDoor
 room_switch = Bar
 
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = VirtualRoom
+room_switch = Trader
+
+[Hotspot]
+name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
+behavior = VirtualRoom
+room_switch = Equipment
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
+[Hotspot]
+name = IDS_HOTSPOT_DECK
+behavior = ExitDoor
+room_switch = Deck
+
 [FlashlightSet]
 icolor = 255, 200, 100
 scale = 0.500000
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_shipdealer.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_shipdealer.ini
index 8e3fabc0..cedf151d 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_shipdealer.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_shipdealer.ini
@@ -14,11 +14,6 @@ ambient = ambience_shipbuy
 [ForSaleShipPlacement]
 name = X/Shipcentre/01
 
-[Hotspot]
-name = IDS_HOTSPOT_DECK
-behavior = ExitDoor
-room_switch = Deck
-
 [Hotspot]
 name = IDS_HOTSPOT_BAR
 behavior = ExitDoor
@@ -41,6 +36,11 @@ name = IDS_HOTSPOT_SHIPDEALER_ROOM
 behavior = ExitDoor
 room_switch = ShipDealer
 
+[Hotspot]
+name = IDS_HOTSPOT_DECK
+behavior = ExitDoor
+room_switch = Deck
+
 [Hotspot]
 name = IDS_NN_REPAIR_YOUR_SHIP
 behavior = Repair
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
index 160688ed..b03b8441 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
@@ -181,6 +181,13 @@ zone = Zone_LI06_dustcloud_storm_01
 file = solar\nebula\li06_nebula.ini
 zone = Zone_LI06_dustcloud_storm_02
 
+[Asteroids]
+file = solar\ASTEROIDS\LI06_asteroid_001.ini
+zone = Zone_LI06_asteroid_001
+
+[Asteroids]
+file = solar\ASTEROIDS\LI06_debris_001.ini
+zone = Zone_LI06_debris_001
 [Ambient]
 color = 50, 50, 50
 
@@ -221,17 +228,6 @@ atmosphere_range = 6500
 burn_color = 255, 225, 120
 ids_info = 66162
 
-[Zone]
-nickname = Zone_LI06_mojavedustcloud_01_exclusion_1
-pos = 1072, 0, 537
-rotate = 0, 0, 0
-shape = SPHERE
-size = 8000
-property_flags = 131072
-sort = 99
-;endregion
-
-;region - Planet Las Vegas
 [Object]
 nickname = LI06_planet_1
 ids_name = 450010
@@ -317,20 +313,20 @@ voice = pilot_c_ill_m02b
 ;region - Primm Station
 [Object]
 nickname = LI06_04
-pos = 36016.23, 144.68, 50301.89
+pos = 38286.160156, 144.679993, 48971.242188
 ids_info = 65713
 behavior = NOTHING
 pilot = pilot_solar_easy
 dock_with = LI06_04_Base
 base = LI06_04_Base
-reputation = li_lsf_grp
+reputation = li_p_grp
 rotate = -8.91, -43.44, 0
-archetype = depot
+archetype = space_police01
 ids_name = 450045
-loadout = rm_depot_li_01
+loadout = space_police01_br_01
 difficulty_level = 1
-space_costume = benchmark_male_head, benchmark_male_body
-voice = atc_leg_m01
+space_costume = , robot_body_B
+voice = atc_leg_f01a
 ;endregion
 
 ;region - Paradise Valley Station
@@ -420,11 +416,11 @@ infocard = 263001
 ;region - Nebula
 [Zone]
 nickname = Zone_LI06_dustcloud_storm_01
-pos = -30500, 0, -10500
+pos = -50000, 0.000000, -2400
 ids_name = 450051
-rotate = 0, -30, 0
+rotate = 0.000000, 23, 0.000000
 shape = ELLIPSOID
-size = 34000, 8000, 20000
+size = 19000, 19000, 31000
 visit = 32
 property_flags = 32772
 property_fog_color = 186, 145, 101
@@ -442,7 +438,7 @@ interference = 0.250000
 
 [Zone]
 nickname = Zone_LI06_dustcloud_storm_02
-pos = 25500, 0, 30000
+pos = 25688.923828, 0.000000, 30330.615234
 ids_name = 450051
 rotate = 0, 30, 0
 shape = ELLIPSOID
@@ -486,7 +482,7 @@ ids_name = 0
 pos = 2665, 0, 44171
 rotate = 0, 0, 0
 shape = SPHERE
-size = 10144
+size = 8000
 property_flags = 130
 ids_info = 0
 visit = 128
@@ -500,7 +496,7 @@ interference = 0.750000
 [Zone]
 nickname = Zone_LI06_radiation_03
 ids_name = 0
-pos = -46542, 0, -17455
+pos = -54388.214844, 0.000000, -4184.240723
 rotate = 0, 0, 0
 shape = SPHERE
 size = 11961
@@ -1135,7 +1131,7 @@ prev_ring = LI06_Trade_Lane_Ring_37
 [Object]
 nickname = LI06_to_Li02
 ids_name = 450002
-pos = 37522, 0, 50823
+pos = 38516.070313, 0.000000, 51136.093750
 rotate = 0, 49.92, 0
 archetype = jumpgate
 msg_id_prefix = gcs_refer_system_Li02
@@ -1170,8 +1166,8 @@ goto = Li02, Li02_to_LI06, gate_tunnel_bretonia
 [Object]
 nickname = LI06_to_Li01_hole
 ids_name = 260622
-pos = 48669, 0, 15476
-rotate = 0, 140, 0
+pos = 53350.050781, 0.000000, 16412.210938
+rotate = 0.000000, 80.000000, 0.000000
 archetype = jumphole_red
 msg_id_prefix = gcs_refer_system_Li01
 jump_effect = jump_effect_hole
@@ -1181,7 +1177,7 @@ goto = Li01, Li01_to_LI06_hole, gate_tunnel_bretonia
 
 [Zone]
 nickname = Zone_LI06_to_Li01_hole
-pos = 48670, 0, 15477
+pos = 53378.589844, 0.000000, 16413.210938
 shape = SPHERE
 size = 1000
 property_flags = 131072
@@ -1191,7 +1187,7 @@ visit = 128
 nickname = LI06_to_Iw04_hole
 ids_name = 260611
 pos = -36850, 0, 4259
-rotate = 0, 140, 0
+rotate = 0.000000, 320.000000, 0.000000
 archetype = jumphole_green
 msg_id_prefix = gcs_refer_system_Iw04
 jump_effect = jump_effect_hole
@@ -1404,41 +1400,24 @@ faction = co_me_grp, 0.200000
 
 [Zone]
 nickname = Zone_LI06_pop_ambient_04
-pos = 44304, 0, 10724
+pos = 41519.078125, 0.000000, 14579.172852
 rotate = 0, 0, 0
 shape = SPHERE
 size = 2924
 comment = Hoover Pop
 sort = 51
 toughness = 4
-density = 3
+density = 6
 repop_time = 25
-max_battle_size = 4
+max_battle_size = 6
 pop_type = Background
-relief_time = 35
+relief_time = 25
 population_additive = false
-faction_weight = co_ic_grp, 6
-faction_weight = co_ni_grp, 6
-faction_weight = co_os_grp, 6
-faction_weight = co_rs_grp, 6
-faction_weight = co_me_grp, 6
-faction_weight = co_shi_grp, 6
-faction_weight = co_ss_grp, 6
-faction_weight = gd_z_grp, 6
-faction_weight = co_vr_grp, 6
-faction_weight = co_alg_grp, 6
-faction_weight = co_nws_grp, 6
-encounter = tradelane_trade_armored, 4, 0.330000
-faction = co_os_grp, 0.150000
-encounter = tradelane_trade_freighter, 4, 0.330000
-faction = co_rs_grp, 0.100000
-faction = co_shi_grp, 0.100000
-faction = co_ss_grp, 0.100000
-faction = gd_z_grp, 0.100000
-encounter = tradelane_trade_transport, 4, 0.330000
-faction = co_vr_grp, 0.100000
-faction = co_alg_grp, 0.200000
-faction = co_me_grp, 0.200000
+faction_weight = fc_lr_grp, 6
+encounter = area_trade_freighter_pirate, 12, 0.300000
+faction = fc_lr_grp, 1.000000
+encounter = area_scout, 12, 0.700000
+faction = fc_lr_grp, 1.000000
 
 [Zone]
 nickname = Zone_LI06_pop_ambient_06
@@ -1492,10 +1471,10 @@ faction = gd_bh_grp, 0.800000
 
 [Zone]
 nickname = Zone_LI06_pop_ambient_08
-pos = -27615, 0, 27820
+pos = -21081.572266, 0.000000, 36018.812500
 rotate = 0, -57, 0
 shape = ELLIPSOID
-size = 28342, 15145, 15145
+size = 15000, 10000, 15000
 comment = Ranch Criminal Pop
 sort = 51
 toughness = 15
@@ -1736,89 +1715,23 @@ faction = co_me_grp, 0.200000
 ;region - Hoover Station
 [Object]
 nickname = LI06_03
-pos = 44329, 0, 10774
-ids_info = 65713
+pos = 41410.226563, 0.000000, 14160.879883
+ids_info = 263018
 behavior = NOTHING
-pilot = pilot_solar_easy
+pilot = pilot_solar_hard
 dock_with = LI06_03_Base
 base = LI06_03_Base
-reputation = gd_z_grp
+reputation = fc_lr_grp
 rotate = 0, 0, 0
-archetype = space_freeport01
+archetype = depot
 ids_name = 450035
-loadout = rm_space_freeport01_li_02
+loadout = rm_depot_li_01
 difficulty_level = 1
-space_costume = benchmark_male_head, benchmark_male_body
-voice = pilot_f_ill_m02a
+space_costume = pl_female1_head, pi_pirate1_body
+voice = atc_leg_f01
 ;endregion
 
 ;region - stationary objects
-[Object]
-nickname = LI06_hazard_buoy_01
-ids_name = 261163
-ids_info = 0
-rotate = 0, 0, 0
-pos = 48167, 0, 14952
-archetype = hazard_buoy
-
-[Object]
-nickname = LI06_hazard_buoy_02
-ids_name = 261163
-ids_info = 0
-rotate = 0, 0, 0
-pos = 47676, 0, 14441
-archetype = hazard_buoy
-
-[Object]
-nickname = LI06_hazard_buoy_03
-ids_name = 261163
-ids_info = 0
-rotate = 0, 0, 0
-pos = 47103, 0, 14032
-archetype = hazard_buoy
-
-[Object]
-nickname = LI06_hazard_buoy_04
-ids_name = 261163
-ids_info = 0
-rotate = 0, 0, 0
-pos = 46305, 0, 13561
-archetype = hazard_buoy
-
-[Object]
-nickname = LI06_hazard_buoy_05
-ids_name = 261163
-ids_info = 0
-rotate = 0, 0, 0
-pos = 45671, 0, 13009
-archetype = hazard_buoy
-
-[Object]
-nickname = LI06_hazard_buoy_06
-ids_name = 261163
-ids_info = 0
-rotate = 0, 0, 0
-pos = 44156, 0, 8056
-archetype = hazard_buoy
-
-[Object]
-nickname = LI06_hazard_buoy_07
-ids_name = 261163
-ids_info = 0
-rotate = 0, 0, 0
-pos = 44034, 0, 7074
-archetype = hazard_buoy
-
-[Object]
-nickname = LI06_hazard_buoy_08
-ids_name = 261163
-ids_info = 0
-rotate = 0, 0, 0
-pos = 44034, 0, 6051
-archetype = hazard_buoy
-;endregion
-
-;region - patrols
 [Zone]
 nickname = Zone_LI06_path_libertypoliceinc01
 pos = 14657, 0, 37105
@@ -2588,7 +2501,7 @@ loadout = fc_x_ge_fighter4_loadout01
 
 [Object]
 nickname = LI06_suprise_li_freighter_02
-pos = -55672, 0, -14266
+pos = -55478.265625, 0.000000, -8841.456055
 visit = 16
 ids_info = 66401
 rotate = 0, 0, 0
@@ -2598,7 +2511,7 @@ loadout = co_li_freighter_loadout01
 
 [Object]
 nickname = LI06_suprise_bw_elite_01
-pos = -54571, 0, -21287
+pos = -59995.542969, 0.000000, -4819.634277
 visit = 16
 ids_info = 66401
 rotate = 0, 0, 0
@@ -2608,7 +2521,7 @@ loadout = fc_rh_bw_elite_loadout01
 
 [Object]
 nickname = LI06_suprise_pi_fighter_01
-pos = -46037, 0, -10687
+pos = -53302.015625, 0.000000, -2937.651611
 visit = 16
 ids_info = 66401
 rotate = 0, 0, 0
@@ -2781,3 +2694,292 @@ mission_type = unlawful, lawful
 sort = 99.500000
 vignette_type = field
 ;endregion
+
+[Zone]
+nickname = Zone_LI06_asteroid_001
+ids_name = 263016
+pos = -50000, 0.000000, -2398
+rotate = 0.000000, 24.216715, 0.000000
+shape = ELLIPSOID
+size = 18500, 18500, 30500
+property_flags = 66
+ids_info = 0
+visit = 32
+damage = 0
+Music = zone_field_asteroid_lava
+comment = Dustcloud Field
+spacedust = lavaashdust
+spacedust_maxparticles = 50
+sort = 99
+
+[Object]
+nickname = Li06_hazard_buoy_001
+pos = -41393, 0, -4043
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_002
+pos = -41672.917969, 0.000000, -1375.876465
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_003
+pos = -42501.652344, 0.000000, 1174.707275
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_004
+pos = -43842.574219, 0.000000, 3497.250977
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_005
+pos = -45637.078125, 0.000000, 5490.248535
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_006
+pos = -47806.734375, 0.000000, 7066.595703
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_007
+pos = -50256.718750, 0.000000, 8157.399414
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_008
+pos = -52880, 0, 8715
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_009
+pos = -55562, 0, 8715
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_010
+pos = -58185.035156, 0.000000, 8157.399414
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_011
+pos = -60635.019531, 0.000000, 7066.595703
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_012
+pos = -62804.675781, 0.000000, 5490.248535
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_013
+pos = -64599.179688, 0.000000, 3497.250977
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_014
+pos = -65940.101563, 0.000000, 1174.707275
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_015
+pos = -66768.835938, 0.000000, -1375.876465
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_016
+pos = -67049, 0, -4043
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_017
+pos = -66768.835938, 0.000000, -6710.178711
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_018
+pos = -65940.101563, 0.000000, -9260.762695
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_019
+pos = -64599.179688, 0.000000, -11583.305664
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_020
+pos = -62804.675781, 0.000000, -13576.303711
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_021
+pos = -60635.019531, 0.000000, -15152.651367
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_022
+pos = -58185.035156, 0.000000, -16243.454102
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_023
+pos = -55562, 0, -16801
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_024
+pos = -52880, 0, -16801
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_025
+pos = -50256.718750, 0.000000, -16243.454102
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_026
+pos = -47806.734375, 0.000000, -15152.651367
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_027
+pos = -45637.078125, 0.000000, -13576.303711
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_028
+pos = -43842.574219, 0.000000, -11583.305664
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_029
+pos = -42501.652344, 0.000000, -9260.762695
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = Li06_hazard_buoy_030
+pos = -41672.917969, 0.000000, -6710.178711
+archetype = hazard_buoy
+ids_name = 261163
+ids_info = 66144
+
+[Object]
+nickname = LI06_object_001
+pos = -55363.000000, 0.000000, -2219.545410
+rotate = 0, 0, 0
+Archetype = br_debris_hull02
+
+[Object]
+nickname = LI06_object_002
+pos = -52509.203125, 0.000000, -7470.529785
+rotate = 0, 0, 0
+Archetype = br_debris_hull04
+
+[Object]
+nickname = LI06_object_003
+pos = -48893.660156, 0.000000, -4022.592773
+rotate = 0, 0, 0
+Archetype = br_debris_hull06
+
+[Zone]
+nickname = Zone_LI06_debris_001
+ids_name = 263019
+pos = 28970.95, 0, 23549.48
+rotate = 0, 0, 0
+shape = ELLIPSOID
+size = 13384.238281, 11859.451172, 11859.451172
+property_flags = 130
+ids_info = 0
+visit = 36
+damage = 0
+comment = Debris Field
+spacedust = asteroiddust
+spacedust_maxparticles = 50
+sort = 99
+
+[Object]
+nickname = LI06_Weapon_Platform_001
+ids_name = 261164
+pos = 40917.539063, 0.000000, 13586.704102
+rotate = 0, 0, 0
+archetype = wplatform_rock
+reputation = fc_lr_grp
+behavior = NOTHING
+ids_info = 66171
+difficulty_level = 6
+loadout = pirate_weapon_platform2_pi_02
+pilot = pilot_solar_hard
+visit = 0
+
+[Object]
+nickname = LI06_Weapon_Platform_002
+ids_name = 261164
+pos = 41956.621094, 0.000000, 14751.727539
+rotate = 0, 0, 0
+archetype = wplatform_rock
+reputation = fc_lr_grp
+behavior = NOTHING
+ids_info = 66171
+difficulty_level = 6
+loadout = pirate_weapon_platform2_pi_02
+pilot = pilot_solar_hard
+visit = 0
diff --git a/DATA/UNIVERSE/universe.ini b/DATA/UNIVERSE/universe.ini
index ffe4ff44..e5c9359a 100644
--- a/DATA/UNIVERSE/universe.ini
+++ b/DATA/UNIVERSE/universe.ini
@@ -1748,8 +1748,8 @@ BGCS_base_run_by = W02bF39
 [Base]
 nickname = LI06_03_Base
 system = LI06
-strid_name = 524292
-file = UNIVERSE\SYSTEMS\LI06\Bases\LI06_03_Base.ini
+strid_name = 450035
+file = UNIVERSE\SYSTEMS\Li06\Bases\LI06_03_Base.ini
 BGCS_base_run_by = W02bF52
 
 [Base]
diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua
index 70f0967d..0314ca26 100644
--- a/EXE/REM/Lua/Infocards.lua
+++ b/EXE/REM/Lua/Infocards.lua
@@ -771,6 +771,17 @@ rem.AddInfoCard(263012, "Deep Space Engineering Marek Fischer")
 rem.AddInfoCard(263013, "Border World Exports Samira Larsen")
 rem.AddInfoCard(263014, "Bounty Hunters Guild Maya Archer")
 rem.AddInfoCard(263015, "Bounty Hunters Guild Steven Archer")
+rem.AddInfoCard(263016, "Dustcloud Field")
+rem.AddInfoCard(263017, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><TEXT>CLASS: Dunkirk</TEXT><PARA/><TEXT>CREW: </TEXT><TRA color="#FF0000"/><TEXT>CLASSIFIED</TEXT><TRA color="default"/><PARA/><TEXT>ARMAMENT: </TEXT><TRA color="#FF0000"/><TEXT>CLASSIFIED</TEXT><PARA/><POP/></RDL>]])
+rem.AddInfoCard(263018, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><TEXT>DIAMETER: N/A</TEXT><PARA/><TEXT>MASS: N/A</TEXT><PARA/><TEXT>TERRAIN: Hidden Base</TEXT><PARA/><TEXT>TEMPERATURE: N/A</TEXT><PARA/><TEXT>ESCAPE VELOCITY: N/A</TEXT><PARA/><PARA/><TEXT>Hidden somewhere in the debris fields near Las Vegas, this pirate base is built inside a collapsed mining frame and shielded by layers of wreckage and dust. What began as a smuggler's hideout was gradually expanded into a fortified black-market refuge for raiders, fence operators, and captains looking to disappear from the rest of Nevada.</TEXT><PARA/><TEXT>The base survives by preying on traffic moving between the planet and the surrounding lanes. Stolen cargo, forged ident codes, and damaged ships are traded here for fuel, repairs, and protection. Zoner patrols know the area is dangerous, but the wreckage makes full inspection nearly impossible, and the pirates use that to their advantage.</TEXT><PARA/><TEXT>Rumors say the base has at least two emergency exits leading into the nearby asteroid field, along with hidden docking points that are never shown on public scans. Anyone who finds the place is advised to leave quickly, because the pirates of Las Vegas prefer to let visitors find the wrong door first.</TEXT><PARA/><POP/></RDL>]])
+rem.AddInfoCard(263019, "Debris Field")
+rem.AddInfoCard(263020, "Hoover Station Bartender Alex Fischer")
+rem.AddInfoCard(263021, "Red Hessians Nadia Sato")
+rem.AddInfoCard(263022, "Red Hessians Tobias Drake")
+rem.AddInfoCard(263023, "Red Hessians Nico Novak")
+rem.AddInfoCard(263024, "Hoover Station Trade Dealer Jonas Fischer")
+rem.AddInfoCard(263025, "Hoover Station Equipment Dealer Rafael Archer")
+rem.AddInfoCard(263026, "Hoover Station Ship Dealer George Buffalo")
 
 -- Thrust Velocity Extensions Equipment
 rem.AddInfoCard(001711, "Thrust Velocity Extension")