diff --git a/aiscripts/betterpiracy.order.fight.corsair.xml b/aiscripts/betterpiracy.order.fight.corsair.xml
index 44f3807..222adc9 100644
--- a/aiscripts/betterpiracy.order.fight.corsair.xml
+++ b/aiscripts/betterpiracy.order.fight.corsair.xml
@@ -147,7 +147,11 @@
 									<match_context macro="this.sector.macro" />
 									<match class="$targetclasses" />
 									<match_distance object="this.ship" max="$radius" />
-									<match_relation_of faction="this.trueowner" comparison="lt" relation="neutral" />
+									<match_any>
+										<!-- either hostile factions or with SCA paintmod (makes more sense than knowing true owner) -->
+										<match_relation_of faction="this.trueowner" comparison="lt" relation="neutral" />
+										<match_paint_mod ware="paintmod_0005" />
+									</match_any>
 									<match trueowner="[this.trueowner, faction.ownerless]" negate="true" />
 								</count_gravidar_contacts>
 								<check_any exact="$detected.count" counter="$i">
diff --git a/aiscripts/betterpiracy.order.fight.harass.xml b/aiscripts/betterpiracy.order.fight.harass.xml
index 0ddede9..f300656 100644
--- a/aiscripts/betterpiracy.order.fight.harass.xml
+++ b/aiscripts/betterpiracy.order.fight.harass.xml
@@ -3,91 +3,92 @@
 	<!-- To properly function, this order will need information available from the harass md script. order triggered via creation of a harass operation. -->
 	<order id="Harass" name="{61537, 5050}" description="{61537, 5051}" category="internal">
 		<params>
-			<param name="target" required="true" type="object" text="{1041, 10126}" comment="Target. The object to harass" />
-			<param name="harassoperation" default="null" type="internal" comment="Harass operation. Harass operation this ship is a part of" />
+			<param name="target" required="true" type="object" text="{1041, 10126}" comment="Target. The object to harass"/>
+			<param name="harassoperation" default="null" type="internal" comment="Harass operation. Harass operation this ship is a part of"/>
 		</params>
 		<requires>
-			<match shiptype="shiptype.lasertower" negate="true" />
+			<match shiptype="shiptype.lasertower" negate="true"/>
 		</requires>
-		<location condition="$target.isoperational" object="$target" />
+		<location condition="$target.isoperational" object="$target"/>
 	</order>
 	<interrupts>
-		<handler ref="SectorChangeHandler" />
-		<handler ref="TargetInvalidHandler" />
-		<handler ref="MissileLockHandler" />
+		<handler ref="SectorChangeHandler"/>
+		<handler ref="TargetInvalidHandler"/>
+		<handler ref="MissileLockHandler"/>
 		<handler comment="Attack target event handler">
 			<conditions>
 				<check_all>
-					<event_object_signalled object="$target" param="$harassoperation" param2="'harass__attack'" />
+					<event_object_signalled object="$target" param="$harassoperation" param2="'harass__attack'"/>
 					<check_value value="$activebehavior != 'attack'"/>
 				</check_all>
 			</conditions>
 			<actions>
-				<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) received an -Attack- signal from harass operation %s.'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation]" />
-				<abort_called_scripts resume="attack" />
+				<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) received an -Attack- signal from harass operation %s.'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation]"/>
+				<abort_called_scripts resume="attack"/>
 			</actions>
 		</handler>
 		<handler comment="Chase target event handler">
 			<conditions>
 				<check_all>
-					<event_object_signalled object="$target" param="$harassoperation" param2="'harass__chase'" />
+					<event_object_signalled object="$target" param="$harassoperation" param2="'harass__chase'"/>
 					<check_value value="$activebehavior != 'chase'"/>
 				</check_all>
 			</conditions>
 			<actions>
-				<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) received a -Chase- signal from harass operation %s.'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation]" />
-				<abort_called_scripts resume="chase" />
+				<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) received a -Chase- signal from harass operation %s.'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation]"/>
+				<abort_called_scripts resume="chase"/>
 			</actions>
 		</handler>
 		<handler comment="End event handler">
 			<conditions>
-				<event_object_signalled object="$target" param="$harassoperation" param2="'harass__end'" />
+				<event_object_signalled object="$target" param="$harassoperation" param2="'harass__end'"/>
 			</conditions>
 			<actions>
-				<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) received an -End- signal from harass operation %s.'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation]" />
-				<abort_called_scripts resume="end" />
+				<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) received an -End- signal from harass operation %s.'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation]"/>
+				<abort_called_scripts resume="end"/>
 			</actions>
 		</handler>
 	</interrupts>
 	<init>
 		<set_value name="$activebehavior" exact="'none'"/>
-		<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) initializing harass operation %s against: %s (%s).'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation, $target.knownname, $target.idcode]" />
+		<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) initializing harass operation %s against: %s (%s).'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation, $target.knownname, $target.idcode]"/>
 	</init>
 	<attention min="unknown">
 		<actions>
 			<!-- Attack action: Attack the target -->
-			<label name="attack" />
+			<label name="attack"/>
 			<set_value name="$activebehavior" exact="'attack'"/>
 			<run_script name="'order.fight.attack.object'">
-				<param name="primarytarget" value="$target" />
-				<param name="allowothertargets" value="false" />
+				<param name="primarytarget" value="$target"/>
+				<param name="allowothertargets" value="false"/>
 			</run_script>
-			<resume label="attack" />
-
+			<resume label="attack"/>
 			<!-- Chase action: Close-in but do NOT attack -->
-			<label name="chase" />
+			<label name="chase"/>
 			<set_value name="$activebehavior" exact="'chase'"/>
-			<cease_fire object="this.ship" />
-			<do_if value="this.ship.isclass.[class.ship_l, class.ship_xl] and this.ship.defencenpc.exists">
+			<cease_fire object="this.ship"/>
+			<do_if value="this.ship.defencenpc.exists">
 				<signal_objects object="this.ship.defencenpc" param="'stop attack'"/>
 			</do_if>
 			<run_script name="'move.generic'">
-				<param name="destination" value="$target" />
+				<param name="destination" value="$target"/>
 			</run_script>
-			<wait exact="2s" />
-			<resume label="chase" />
-
+			<wait exact="2s"/>
+			<resume label="chase"/>
 			<!-- End action: CleanUp and finish -->
 			<label name="end"/>
-			<cease_fire object="this.ship" />
-			<do_if value="this.ship.isclass.[class.ship_l, class.ship_xl] and this.ship.defencenpc.exists">
+			<cease_fire object="this.ship"/>
+			<do_if value="this.ship.defencenpc.exists">
 				<signal_objects object="this.ship.defencenpc" param="'stop attack'"/>
 			</do_if>
-			<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) ending harass operation %s against: %s (%s).'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation, $target.knownname, $target.idcode]" />
+			<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) ending harass operation %s against: %s (%s).'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation, $target.knownname, $target.idcode]"/>
 		</actions>
 	</attention>
 	<on_abort>
-		<cease_fire object="this.ship" />
-		<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) aborting harass operation %s against: %s (%s).'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation, $target.knownname, $target.idcode]" />
+		<cease_fire object="this.ship"/>
+		<do_if value="this.ship.defencenpc.exists">
+			<signal_objects object="this.ship.defencenpc" param="'stop attack'"/>
+		</do_if>
+		<debug_to_file name="'BetterPiracy'" text="'%s --- betterpiracy.order.fight.harass --- %s (%s) aborting harass operation %s against: %s (%s).'.[player.age, this.assignedcontrolled.knownname, this.assignedcontrolled.idcode, $harassoperation, $target.knownname, $target.idcode]"/>
 	</on_abort>
 </aiscript>
\ No newline at end of file
diff --git a/aiscripts/move.claim.xml b/aiscripts/move.claim.xml
index c80af30..5440230 100644
--- a/aiscripts/move.claim.xml
+++ b/aiscripts/move.claim.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <diff>
 	<!-- Remove all the hull and component damage caused by "Marine claiming" -->
-	<!-- This selector matches lines 106 and 207 -->
-	<remove sel="/aiscript/attention[@min='unknown']/actions/do_if[@value='this.ship == $target']/do_if[@value='$damagemaxpercent lt 100']"/>
-	<remove sel="/aiscript/attention[@min='visible']/actions/do_if[@value='this.ship == $target']/do_if[@value='$damagemaxpercent lt 100']"/>
+	<!-- This selector matches lines 117 and 224 -->
+	<remove sel="/aiscript/attention[@min='unknown']/actions/do_if[@value='this.ship == $target']/do_if[@value='$damagemaxpercent gt 0']"/>
+	<remove sel="/aiscript/attention[@min='visible']/actions/do_if[@value='this.ship == $target']/do_if[@value='$damagemaxpercent gt 0']"/>
 
 	<!-- Avoid having marines looping arround the target -->
 	<!-- This selector matches lines 31 -->
diff --git a/aiscripts/move.flee.dock.xml b/aiscripts/move.flee.dock.xml
deleted file mode 100644
index aa1a007..0000000
--- a/aiscripts/move.flee.dock.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<diff>
-	<!-- Only allied station will be selected -->
-	<!-- This selector matches lines 31 -->
-	<replace sel="//find_station">
-		<find_station name="$stations" functional="true" space="this.zone" multiple="true" >
-			<match_relation_to object="this" relation="neutral" comparison="ge" />
-			<match_relation_to object="$attacker" relation="neutral" comparison="le" />
-		</find_station>
-	</replace>
-</diff>
diff --git a/md/betterpiracy_config.xml b/md/betterpiracy_config.xml
index 277e8ce..204f7a8 100644
--- a/md/betterpiracy_config.xml
+++ b/md/betterpiracy_config.xml
@@ -11,27 +11,27 @@
         <set_value
           name="Config.$Config"
           exact="table[
-            $harass_shield_threshold = null,
-            $early_harass_hull_threshold = null,
-            $harass_bail_attemps_before_mid = null,
-            $mid_harass_hull_threshold = null,
-            $harass_bail_attemps_before_late = null,
-            $late_harass_hull_threshold = null,
-            $keep_pressure_timer = null,
-            $keep_pressure_max_distance_sm = null,
-            $keep_pressure_max_distance_lxl = null,
-            $pressure_buildup_rate = null,
-            $harass_lxl_min_crew_left_base = null,
-            $harass_lxl_min_crew_left_pilot = null,
-            $harass_base_bail_chance = null,
-            $harass_base_bail_number = null,
-            $harass_reputation_hit = null,
-            $harass_bailing_pilots_damage_hull = null,
-            $harass_bailing_pilots_destroy_components = null,
-            $combat_base_bail_chance = null,
-            $combat_reputation_hit = null,
-            $combat_bailing_pilots_damage_hull = null,
-            $combat_bailing_pilots_destroy_components = null
+            $harass_shield_threshold = 20,
+            $early_harass_hull_threshold = 75,
+            $harass_bail_attemps_before_mid = 3,
+            $mid_harass_hull_threshold = 50,
+            $harass_bail_attemps_before_late = 6,
+            $late_harass_hull_threshold = 25,
+            $keep_pressure_timer = 10,
+            $keep_pressure_max_distance_sm = 3,
+            $keep_pressure_max_distance_lxl = 6,
+            $pressure_buildup_rate = 1,
+            $harass_lxl_min_crew_left_base = 25,
+            $harass_lxl_min_crew_left_pilot = 25,
+            $harass_base_bail_chance = 60,
+            $harass_base_bail_number = 20,
+            $harass_reputation_hit = 1,
+            $harass_bailing_pilots_damage_hull = 0,
+            $harass_bailing_pilots_destroy_components = 0,
+            $combat_base_bail_chance = 36,
+            $combat_reputation_hit = 1,
+            $combat_bailing_pilots_damage_hull = 0,
+            $combat_bailing_pilots_destroy_components = 0
           ]"
         />
       </actions>
@@ -52,7 +52,7 @@
             $mouseover  = {61537, 5152},
             $type       = 'slidercell',
             $default    = 20,
-            $args       = table[$min = 0, $max = 100, $suffix = '%'],
+            $args       = table[$min = 11, $max = 100, $suffix = '%'],
             $callback   = OnChange
           ]"
         />
@@ -65,7 +65,7 @@
             $mouseover  = {61537, 5154},
             $type       = 'slidercell',
             $default    = 75,
-            $args       = table[$min = 0, $max = 100, $suffix = '%'],
+            $args       = table[$min = 1, $max = 100, $suffix = '%'],
             $callback   = OnChange
           ]"
         />
@@ -91,7 +91,7 @@
             $mouseover  = {61537, 5158},
             $type       = 'slidercell',
             $default    = 50,
-            $args       = table[$min = 0, $max = 100, $suffix = '%'],
+            $args       = table[$min = 1, $max = 100, $suffix = '%'],
             $callback   = OnChange
           ]"
         />
@@ -117,7 +117,7 @@
             $mouseover  = {61537, 5162},
             $type       = 'slidercell',
             $default    = 25,
-            $args       = table[$min = 0, $max = 100, $suffix = '%'],
+            $args       = table[$min = 1, $max = 100, $suffix = '%'],
             $callback   = OnChange
           ]"
         />
diff --git a/md/betterpiracy_harass.xml b/md/betterpiracy_harass.xml
index 7f751c0..e451f88 100644
--- a/md/betterpiracy_harass.xml
+++ b/md/betterpiracy_harass.xml
@@ -1,456 +1,430 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <mdscript name="Betterpiracy_harass" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://x4libonline.ddns.net/libraries/md.xsd">
-<cues>
-  <!-- Add the custom interaction menu entry. -->
-  <cue name="Add_Interact_Actions" instantiate="true">
-    <conditions>
-      <event_cue_signalled cue="md.Interact_Menu_API.Get_Actions" />
-    </conditions>
-    <actions>
-      <set_value name="$target" exact="event.param.$object"/>
-      <do_if value="$target.isclass.ship and $target.pilot.exists and $target.isoperational and $target.iscapturable and not $target.isplayerowned and not $target.isunit and not $target.islasertower">
-        <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- Added custom `Harass` interact action as:  %s.'.[player.age, {61537, 5050}]" />
-        <signal_cue_instantly
-          cue="md.Interact_Menu_API.Add_Action"
-          param = "table[
-            $id         = 'betterpiracy_harass',
-            $section    = 'interaction',
-            $text       = {61537, 5050},
-            $mouseover  = {61537, 5051},
-            $icon       = 'order_harass',
-            $mouseover_icon = 'order_harass',
-            $callback   = Harass_OperationCreated,
-            ]"/>
-      </do_if>
-    </actions>
-  </cue>
-
-  <!-- Root cue where the state of the operation will be stored -->
-  <cue name="Harass_OperationCreated" instantiate="true" namespace="this">
-    <conditions>
-      <check_any>
-        <event_cue_signalled/>
-        <event_object_signalled object="player.entity" param="'corsair_init_harass'" />
-      </check_any>
-    </conditions>
-    <actions>
-      <set_value name="$MissionCue"   exact="Harass_OperationCreated"/>
-
-      <do_if value="event.param == 'corsair_init_harass'">
-        <set_value name="$MainHarasser" exact="event.param2"/>
-        <set_value name="$Target"       exact="event.param3"/>
-        <set_value name="$HasMission"   exact="false"/>
-      </do_if>
-      <do_else>
-        <set_value name="$MainHarasser" exact="player.ship"/>
-        <set_value name="$Target"       exact="event.param.$object"/>
-        <set_value name="$HasMission"   exact="true"/>
-      </do_else>
-      
-      
-      <set_value name="$Config"       exact="md.Betterpiracy_config.Config.$Config"/>
-      <set_value name="$CurrentPhase" exact="'Harass_OperationCreated'"/>
-      <set_value name="$Pressure"     exact="0"/>
-      <set_value name="$BailAttemps" exact="0"/>
-
-      <do_if value="$Target.iscapitalship">
-        <set_value name="$MaxDistance" exact="($Config.{'$keep_pressure_max_distance_lxl'})km"/>
-      </do_if>
-      <do_else>
-        <set_value name="$MaxDistance" exact="($Config.{'$keep_pressure_max_distance_sm'})km"/>
-      </do_else>
-
-      <set_value name="$MissionStep_DamageShields" exact="1"/>
-      <set_value name="$MissionStep_DamageHull"    exact="2"/>
-      <set_value name="$MissionStep_ChaseTarget"   exact="3"/>
-      <set_value name="$MissionStep_WaitBailing"   exact="4"/>
-      <set_value name="$MissionStep_ClaimShip"     exact="5"/>
-
-      <set_value name="$Harassers" exact="$MainHarasser.subordinates" />
-      <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- Harass operation created: $MissionCue = %s, $MainHarasser = %s (%s), $Target = %s (%s), $MaxDistance = %s.'.[player.age, $MissionCue, $MainHarasser.knownname, $MainHarasser.idcode, $Target.knownname, $Target.idcode, $MaxDistance]" />
-    </actions>
-    <cues>
-      <cue name="Harass_Init">
-        <actions>
-          <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_Init` cue.'.[player.age, $MissionCue]" />
-          <signal_cue_instantly cue="Harass_ChangePhase" param="'createMission'"/>
-        </actions>
-      </cue>
-      <cue name="Harass_Aborted">
-        <conditions>
-          <event_mission_aborted cue="$MissionCue"/>
-        </conditions>
-        <actions>
-          <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_Aborted` cue.'.[player.age, $MissionCue]" />
-          <signal_cue_instantly cue="Harass_ChangePhase" param="'finish'"/>
-        </actions>
-      </cue>
-
-      <!-- Library - INIT -->
-      <library name="Harass_CheckTarget">
-        <actions>
-          <do_if value="not $Target.isoperational or $Target.dock or not $MainHarasser.isoperational or $MainHarasser.sector != $Target.sector">
-            <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckTarget` library check failed, operation can not continue: $Target.isoperational = %s, $Target.dock = %s, $MainHarasser.isoperational = %s, $MainHarasser.sector = %s, $Target.sector = %s'.[player.age, $MissionCue, $Target.isoperational, $Target.dock, $MainHarasser.isoperational, $MainHarasser.sector, $Target.sector]" />
-            <signal_cue_instantly cue="Harass_ChangePhase" param="'finish'"/>
-          </do_if>
-          <do_if value="$Target.owner == faction.ownerless">
-            <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckTarget` library check passed, moving to claim phase: $Target.owner = %s'.[player.age, $MissionCue, $Target.owner]" />
-            <signal_cue_instantly cue="Harass_ChangePhase" param="'claim'"/>
-          </do_if>
-          <do_if value="$Target.owner == faction.player">
-            <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckTarget` library check passed, moving to finish phase: $Target.owner = %s'.[player.age, $MissionCue, $Target.owner]" />
-            <signal_cue_instantly cue="Harass_ChangePhase" param="'finish'"/>
-          </do_if>
-        </actions>
-      </library>
-      <library name="Harass_CheckShields">
-        <actions>
-          <do_if value="$Target.shieldpercentage ge $Config.{'$harass_shield_threshold'}">
-            <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckShields` library check failed, rolling back to damageShields phase: $Target.shieldpercentage = %s, $Config.{`$harass_shield_threshold`} = %s'.[player.age, $MissionCue, $Target.shieldpercentage, $Config.{'$harass_shield_threshold'}]" />
-            <signal_cue_instantly cue="Harass_ChangePhase" param="'damageShields'"/>
-          </do_if>
-        </actions>
-      </library>
-      <library name="Harass_CheckHull">
-        <actions>
-          <do_if value="$BailAttemps ge $Config.{'$harass_bail_attemps_before_late'} and $Target.hullpercentage ge $Config.{'$late_harass_hull_threshold'}">
-            <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckHull` library check failed, rolling back to damageHull phase: $Target.hullpercentage = %s, $BailAttemps = %s, $Config.{`$harass_bail_attemps_before_mid`} = %s, $Config.{`$harass_bail_attemps_before_late`} = %s, $Config.{`$early_harass_hull_threshold`} = %s, $Config.{`$mid_harass_hull_threshold`} = %s, $Config.{`$late_harass_hull_threshold`} = %s'.[player.age, $MissionCue, $Target.hullpercentage, $BailAttemps, $Config.{'$harass_bail_attemps_before_mid'}, $Config.{'$harass_bail_attemps_before_late'}, $Config.{'$early_harass_hull_threshold'}, $Config.{'$mid_harass_hull_threshold'}, $Config.{'$late_harass_hull_threshold'}]" />
-            <signal_cue_instantly cue="Harass_ChangePhase" param="'damageHull'"/>
-          </do_if>
-          <do_elseif value="$BailAttemps ge $Config.{'$harass_bail_attemps_before_mid'} and $Target.hullpercentage ge $Config.{'$mid_harass_hull_threshold'}">
-            <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckHull` library check failed, rolling back to damageHull phase: $Target.hullpercentage = %s, $BailAttemps = %s, $Config.{`$harass_bail_attemps_before_mid`} = %s, $Config.{`$harass_bail_attemps_before_late`} = %s, $Config.{`$early_harass_hull_threshold`} = %s, $Config.{`$mid_harass_hull_threshold`} = %s, $Config.{`$late_harass_hull_threshold`} = %s'.[player.age, $MissionCue, $Target.hullpercentage, $BailAttemps, $Config.{'$harass_bail_attemps_before_mid'}, $Config.{'$harass_bail_attemps_before_late'}, $Config.{'$early_harass_hull_threshold'}, $Config.{'$mid_harass_hull_threshold'}, $Config.{'$late_harass_hull_threshold'}]" />
-            <signal_cue_instantly cue="Harass_ChangePhase" param="'damageHull'"/>
-          </do_elseif>
-          <do_elseif value="$Target.hullpercentage ge $Config.{'$early_harass_hull_threshold'}">
-            <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckHull` library check failed, rolling back to damageHull phase: $Target.hullpercentage = %s, $BailAttemps = %s, $Config.{`$harass_bail_attemps_before_mid`} = %s, $Config.{`$harass_bail_attemps_before_late`} = %s, $Config.{`$early_harass_hull_threshold`} = %s, $Config.{`$mid_harass_hull_threshold`} = %s, $Config.{`$late_harass_hull_threshold`} = %s'.[player.age, $MissionCue, $Target.hullpercentage, $BailAttemps, $Config.{'$harass_bail_attemps_before_mid'}, $Config.{'$harass_bail_attemps_before_late'}, $Config.{'$early_harass_hull_threshold'}, $Config.{'$mid_harass_hull_threshold'}, $Config.{'$late_harass_hull_threshold'}]" />
-            <signal_cue_instantly cue="Harass_ChangePhase" param="'damageHull'"/>
-          </do_elseif>
-        </actions>
-      </library>
-      <library name="Harass_CheckDistance">
-        <actions>
-          <set_value name="$HarassersInRange" exact="0"/>
-          <!-- Check if player is close to target -->
-          <do_if value="player.entity.distanceto.{$Target} le $MaxDistance">
-            <set_value name="$HarassersInRange" operation="add"/>
-          </do_if>
-          <!-- Check if harassers are close to target -->
-          <do_all exact="$Harassers.count" counter="$i">
-            <do_if value="$Harassers.{$i}.distanceto.{$Target} le $MaxDistance">
-              <set_value name="$HarassersInRange" operation="add"/>
-            </do_if>
-          </do_all>
-
-          <do_if value="$HarassersInRange == 0">
-            <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_CheckDistance` library check failed, rolling back to chaseTarget phase: $HarassersInRange = %s'.[player.age, $MissionCue, $HarassersInRange]" />
-            <signal_cue_instantly cue="Harass_ChangePhase" param="'chaseTarget'"/>
-          </do_if>
-        </actions>
-      </library>
-      <library name="Harass_CheckCrew">
-        <actions>
-          <do_if value="$Target.iscapitalship and $Target.people.count le ($Target.people.capacity * ($Config.{'$harass_lxl_min_crew_left_base'} + ($Config.{'$harass_lxl_min_crew_left_pilot'} * ((15 - $Target.pilot.skill.morale)f / 15.0))) / 100)i">
-            <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_CheckCrew` library check passed, moving to claim phase: $Target.iscapitalship = %s'.[player.age, $MissionCue, $Target.iscapitalship]" />
-            <signal_cue_instantly cue="Harass_ChangePhase" param="'claim'"/>
-          </do_if>
-        </actions>
-      </library>
-      <!-- Library - END -->
-
-      <!-- Utility cue to change between phases -->
-      <cue name="Harass_ChangePhase" instantiate="true">
-        <conditions>
-          <event_cue_signalled/>
-        </conditions>
-        <actions>
-          <do_if value="$CurrentPhase">
-            <set_value name="$TargetPhase" exact="event.param"/>
-
-            <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s changing phase from `%s` to `%s`.'.[player.age, $MissionCue, $CurrentPhase, $TargetPhase]" />
-          
-            <do_if value="$CurrentPhase != 'Harass_OperationCreated'">
-              <cancel_cue cue="$CurrentPhase"/>
-            </do_if>
-            <set_value name="$CurrentPhase" exact="null"/>
-          
-            <do_if value="$TargetPhase == 'createMission'">
-              <signal_cue cue="Harass_CreateMission"/>
-            </do_if>
-            <do_elseif value="$TargetPhase == 'damageShields'">
-              <signal_cue cue="Harass_DamageShields"/>
-            </do_elseif>
-            <do_elseif value="$TargetPhase == 'damageHull'">
-              <signal_cue cue="Harass_DamageHull"/>
-            </do_elseif>
-            <do_elseif value="$TargetPhase == 'chaseTarget'">
-              <signal_cue cue="Harass_ChaseTarget"/>
-            </do_elseif>
-            <do_elseif value="$TargetPhase == 'waitSurrender'">
-              <signal_cue cue="Harass_WaitForSurrender"/>
-            </do_elseif>
-            <do_elseif value="$TargetPhase == 'claim'">
-              <signal_cue cue="Harass_Claim"/>
-            </do_elseif>
-            <do_elseif value="$TargetPhase == 'finish'">
-              <signal_cue cue="Harass_Finish"/>
-            </do_elseif>
-          </do_if>
-          <do_else>
-            <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s changing phase to `%s` skipped.'.[player.age, $MissionCue, $TargetPhase]" />
-          </do_else>
-        </actions>
-      </cue>
-
-      <cue name="Harass_CreateMission" instantiate="true">
-        <conditions>
-          <event_cue_signalled/>
-        </conditions>
-        <actions>
-          <set_value name="$CurrentPhase" exact="this"/>
-
-          <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_CreateMission` cue.'.[player.age, $MissionCue]" />
-          <do_if value="$HasMission">
-            <create_mission cue="$MissionCue" name="{61537, 5101}" description="{61537, 5102}" faction="faction.player" type="missiontype.fight">
-              <briefing>
-                <objective step="$MissionStep_DamageShields"  action="objective.custom"   customaction="{61537, 5103}"  text="{61537, 5105}" comment="'Increase pressure: Destroy their shields'"/>
-                <objective step="$MissionStep_DamageHull"     action="objective.custom"   customaction="{61537, 5103}"  text="{61537, 5106}" comment="'Increase pressure: Damage their hull'"/>
-                <objective step="$MissionStep_ChaseTarget"    action="objective.approach"                               text="{61537, 5107}" comment="'Approach: Get closer to your target'"/>
-                <objective step="$MissionStep_WaitBailing"    action="objective.custom"   customaction="{61537, 5104}"  text="{61537, 5108}" comment="'Maintain pressure: Do not kill the target!'"/>
-                <objective step="$MissionStep_ClaimShip"      action="objective.claim"                                  text="{61537, 5109}" comment="'Claim: The ship is empty'"/>
-              </briefing>
-            </create_mission>
-          </do_if>
-          <do_else>
-            <create_order id="'Harass'" object="$MainHarasser">
-              <param name="target"          value="$Target"/>
-              <param name="harassoperation" value="$MissionCue"/>
-            </create_order>
-            <create_order id="'Attack'" object="$Target" chance="($MainHarasser.pilot.skill.piloting * 100) / 15" immediate="true">
-              <param name="primarytarget"   value="$MainHarasser"/>
-              <param name="checkrelation"   value="false" />
-            </create_order>
-          </do_else>
-
-          <do_all exact="$Harassers.count" counter="$i">
-            <create_order id="'Harass'" object="$Harassers.{$i}">
-              <param name="target"          value="$Target"/>
-              <param name="harassoperation" value="$MissionCue"/>
-            </create_order>
-          </do_all>
-
-          <signal_cue_instantly cue="Harass_ChangePhase" param="'damageShields'"/>
-        </actions>
-      </cue>
-
-      <cue name="Harass_DamageShields" instantiate="true">
-        <conditions>
-          <event_cue_signalled/>
-        </conditions>
-        <actions>
-          <set_value name="$CurrentPhase" exact="this"/>
-          <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_DamageShields` cue.'.[player.age, $MissionCue]" />
-          <signal_objects object="$Target" param="$MissionCue" param2="'harass__attack'"/>
-        </actions>
-        <cues>
-          <cue name="Harass_DamageShields_Check" instantiate="true" checkinterval="1s">
-            <actions>
-              <include_actions ref="Harass_CheckTarget"/>
-
-              <do_if value="$Target.shieldpercentage le ($Config.{'$harass_shield_threshold'} - 10)">
-                <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s --- `Harass_DamageShields_Check` passed, moving to damageHull phase: $Target.shieldpercentage = %s, $Config.{`$harass_shield_threshold`} = %s.'.[player.age, $MissionCue, $Target.shieldpercentage, $Config.{'$harass_shield_threshold'}]" />
-                <signal_cue_instantly cue="Harass_ChangePhase" param="'damageHull'"/>
-              </do_if>
-              <do_else>
-                <do_if value="$HasMission">
-                  <set_objective cue="$MissionCue" step="$MissionStep_DamageShields" action="objective.custom" customaction="{61537, 5103}" text="{61537, 5105}" object="$Target" silent="true">
-                    <progress progress="100 - $Target.shieldpercentage" max="100 - ($Config.{'$harass_shield_threshold'} - 10)"/>
-                  </set_objective>
-                </do_if>
-              </do_else>
-            </actions>
-          </cue>
-        </cues>
-      </cue>
-
-      <cue name="Harass_DamageHull" instantiate="true">
-        <conditions>
-          <event_cue_signalled/>
-        </conditions>
-        <actions>
-          <set_value name="$CurrentPhase" exact="this"/>
-          <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_DamageHull` cue.'.[player.age, $MissionCue]" />
-          <signal_objects object="$Target" param="$MissionCue" param2="'harass__attack'"/>
-        </actions>
-        <cues>
-          <cue name="Harass_DamageHull_Check" instantiate="true" checkinterval="1s">
-            <actions>
-              <include_actions ref="Harass_CheckTarget"/>
-              <include_actions ref="Harass_CheckShields"/>
-    
-              <do_if value="$BailAttemps ge $Config.{'$harass_bail_attemps_before_late'}">
-                <set_value name="$MissedHullThreshold" exact="100 - $Config.{'$late_harass_hull_threshold'}"/>
-              </do_if>
-              <do_elseif value="$BailAttemps ge $Config.{'$harass_bail_attemps_before_mid'}">
-                <set_value name="$MissedHullThreshold" exact="100 - $Config.{'$mid_harass_hull_threshold'}"/>
-              </do_elseif>
-              <do_else>
-                <set_value name="$MissedHullThreshold" exact="100 - $Config.{'$early_harass_hull_threshold'}"/>
-              </do_else>
-
-              <set_value name="$TargetHullMissed" exact="100 - $Target.hullpercentage"/>
-              <do_if value="$TargetHullMissed ge $MissedHullThreshold">
-                <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s --- `Harass_DamageHull_Check` passed, moving to chaseTarget phase: $Target.hullpercentage = %s, $TargetHullMissed = %s.'.[player.age, $MissionCue, $Target.hullpercentage, $TargetHullMissed]" />
-                <signal_cue_instantly cue="Harass_ChangePhase" param="'chaseTarget'"/>
-              </do_if>
-              <do_else>
-                <do_if value="$HasMission">
-                  <set_objective cue="$MissionCue" step="$MissionStep_DamageHull" action="objective.custom" customaction="{61537, 5103}" text="{61537, 5106}" object="$Target" silent="true">
-                    <progress progress="$TargetHullMissed" max="$MissedHullThreshold"/>
-                  </set_objective>
-                </do_if>
-              </do_else>
-            </actions>
-          </cue>
-        </cues>
-      </cue>
-
-      <cue name="Harass_ChaseTarget" instantiate="true">
-        <conditions>
-          <event_cue_signalled/>
-        </conditions>
-        <actions>
-          <set_value name="$CurrentPhase" exact="this"/>
-          <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_ChaseTarget` cue.'.[player.age, $MissionCue]" />
-          <signal_objects object="$Target" param="$MissionCue" param2="'harass__chase'"/>
-          <do_if value="$HasMission">
-            <set_objective cue="$MissionCue" step="$MissionStep_ChaseTarget" action="objective.approach" text="{61537, 5107}" object="$Target" silent="true"/>
-          </do_if>
-        </actions>
-        <cues>
-          <cue name="Harass_ChaseTarget_Check" instantiate="true" checkinterval="1s">
-            <actions>
-              <include_actions ref="Harass_CheckTarget"/>
-              <include_actions ref="Harass_CheckShields"/>
-              <include_actions ref="Harass_CheckHull"/>
-
-              <set_value name="$HarassersInRange" exact="0"/>
-              <!-- Check if player is close to target -->
-              <do_if value="player.entity.distanceto.{$Target} le $MaxDistance">
-                <set_value name="$HarassersInRange" operation="add"/>
-              </do_if>
-              <!-- Check if harassers are close to target -->
-              <do_all exact="$Harassers.count" counter="$i">
-                <do_if value="$Harassers.{$i}.distanceto.{$Target} le $MaxDistance">
-                  <set_value name="$HarassersInRange" operation="add"/>
-                </do_if>
-              </do_all>
-              <do_if value="$HarassersInRange gt 0">
-                <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s --- `Harass_ChaseTarget_Check` passed, moving to waitSurrender phase: $HarassersInRange = %s.'.[player.age, $MissionCue, $HarassersInRange]" />
-                <signal_cue_instantly cue="Harass_ChangePhase" param="'waitSurrender'"/>
-              </do_if>
-            </actions>
-          </cue>
-        </cues>
-      </cue>
-
-      <cue name="Harass_WaitForSurrender" instantiate="true">
-        <conditions>
-          <event_cue_signalled/>
-        </conditions>
-        <actions>
-          <set_value name="$CurrentPhase" exact="this"/>
-          <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_WaitForSurrender` cue.'.[player.age, $MissionCue]" />
-          <signal_objects object="$Target" param="$MissionCue" param2="'harass__chase'"/>
-          <set_value name="$NextBailCheck" exact="player.age + ($Config.{'$keep_pressure_timer'})s"/>
-          <set_value name="$InitialTimeLeft" exact="$NextBailCheck - player.age"/>
-        </actions>
-        <cues>
-          <cue name="Harass_WaitForSurrender_Check" instantiate="true" checkinterval="1s">
-            <actions>
-              <include_actions ref="Harass_CheckTarget"/>
-              <include_actions ref="Harass_CheckCrew"/>
-              <include_actions ref="Harass_CheckShields"/>
-              <include_actions ref="Harass_CheckHull"/>
-              <include_actions ref="Harass_CheckDistance"/>
-
-              <set_value name="$CurrentTimeLeft" exact="$NextBailCheck - player.age"/>
-              <do_if value="$HasMission">
-                <set_objective cue="$MissionCue" step="$MissionStep_WaitBailing" action="objective.custom" customaction="{61537, 5104}" text="{61537, 5108}" object="$Target" silent="true">
-                  <progress progress="$InitialTimeLeft - $CurrentTimeLeft" max="$InitialTimeLeft"/>
-                </set_objective>
-              </do_if>
-              
-              <do_if value="$CurrentTimeLeft le 0">
-                <set_value name="$NextBailCheck" exact="player.age + ($Config.{'$keep_pressure_timer'})s"/>
-                <set_value name="$Pressure" operation="add"/>
-                <set_value name="$BailAttemps" operation="add"/>
-                <do_if value="$HasMission">
-                  <speak actor="player.computer" page="61538" line="[4401, 4402, 4403, 4404, 4405, 4406, 4407, 4408, 4409].random" priority="90"/>
-                </do_if>
-                <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s --- `Harass_WaitForSurrender_Check` passed, triggering bail attemp: $NextBailCheck = %s, $Pressure = %s, $BailAttemps = %s.'.[player.age, $MissionCue, $NextBailCheck, $Pressure, $BailAttemps]" />
-                <signal_cue_instantly cue="md.Betterpiracy_custom_bail_logic.PlayerOwnedShipHarass" param="$MissionCue"/>
-              </do_if>
-            </actions>
-          </cue>
-        </cues>
-      </cue>
-
-      <cue name="Harass_Claim" instantiate="true">
-        <conditions>
-          <event_cue_signalled/>
-        </conditions>
-        <actions>
-          <set_value name="$CurrentPhase" exact="this"/>
-          <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_Claim` cue.'.[player.age, $MissionCue]" />
-          <signal_objects object="$Target" param="$MissionCue" param2="'harass__end'"/>
-          <!-- Give experience to involved ships -->
-          <do_if value="not $HasMission">
-            <apply_experience entity="$MainHarasser.pilot" experience="'BETTER_PIRACY_HARASS'" factor="1.0"/>
-            <apply_experience object="$MainHarasser" experience="'BETTER_PIRACY_HARASS'" role="entityrole.service" factor="1.0"/>
-          </do_if>
-          <do_all exact="$Harassers.count" counter="$i">
-            <apply_experience entity="$Harassers.{$i}.pilot" experience="'BETTER_PIRACY_HARASS'" factor="0.8"/>
-            <apply_experience object="$Harassers.{$i}" experience="'BETTER_PIRACY_HARASS'" role="entityrole.service" factor="0.8"/>
-          </do_all>
-          <!-- Move to the next phase or finish -->
-          <do_if value="$HasMission">
-            <do_if value="$Target.iscapitalship">
-              <set_objective cue="$MissionCue" step="$MissionStep_ClaimShip" action="objective.board" text="{61537, 5110}" object="$Target" silent="true"/>
-            </do_if>
-            <do_else>
-              <set_objective cue="$MissionCue" step="$MissionStep_ClaimShip" action="objective.claim" text="{61537, 5109}" object="$Target" silent="true"/>
-            </do_else>
-          </do_if>
-          <do_else>
-            <signal_cue_instantly cue="Harass_ChangePhase" param="'finish'"/>
-          </do_else>
-        </actions>
-        <cues>
-          <cue name="Harass_Claim_Check" instantiate="true" checkinterval="1s">
-            <actions>
-              <do_if value="$Target.owner == faction.player or not $Target.isoperational">
-                <signal_cue_instantly cue="Harass_ChangePhase" param="'finish'"/>
-              </do_if>
-            </actions>
-          </cue>
-        </cues>
-      </cue>
-
-      <cue name="Harass_Finish" instantiate="true">
-        <conditions>
-          <event_cue_signalled/>
-        </conditions>
-        <actions>
-          <debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_Finish` cue.'.[player.age, $MissionCue]" />
-
-          <signal_objects object="$Target" param="$MissionCue" param2="'harass__end'"/>
-          <do_if value="$HasMission">
-            <remove_mission cue="$MissionCue" type="completed"/>
-          </do_if>
-          <cancel_cue cue="$MissionCue"/>
-        </actions>
-      </cue>
-    </cues>
-  </cue>
-</cues>
+	<cues>
+		<!-- Add the custom interaction menu entry. -->
+		<cue name="Add_Interact_Actions" instantiate="true">
+			<conditions>
+				<check_all>
+					<event_cue_signalled cue="md.Interact_Menu_API.Get_Actions"/>
+					<check_value value="not (player.activemissiontype == missiontype.raid)"/>
+				</check_all>
+			</conditions>
+			<actions>
+				<set_value name="$target" exact="event.param.$object"/>
+				<do_if value="$target.isclass.ship and $target.pilot.exists and $target.isoperational and $target.iscapturable and not $target.isplayerowned and not $target.isunit and not $target.islasertower">
+					<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- Added custom `Harass` interact action as:  %s.'.[player.age, {61537, 5050}]"/>
+					<signal_cue_instantly cue="md.Interact_Menu_API.Add_Action" param="table[
+						$id         = 'betterpiracy_harass',
+						$section    = 'interaction',
+						$text       = {61537, 5050},
+						$mouseover  = {61537, 5051},
+						$icon       = 'order_harass',
+						$mouseover_icon = 'order_harass',
+						$callback   = Harass_OperationCreated,
+						]"/>
+				</do_if>
+			</actions>
+		</cue>
+		<!-- Root cue where the state of the operation will be stored -->
+		<cue name="Harass_OperationCreated" instantiate="true" namespace="this">
+			<conditions>
+				<check_any>
+					<event_cue_signalled/>
+					<event_object_signalled object="player.entity" param="'corsair_init_harass'"/>
+				</check_any>
+			</conditions>
+			<actions>
+				<set_value name="$MissionCue" exact="Harass_OperationCreated"/>
+				<do_if value="event.param == 'corsair_init_harass'">
+					<set_value name="$MainHarasser" exact="event.param2"/>
+					<set_value name="$Target" exact="event.param3"/>
+					<set_value name="$HasMission" exact="false"/>
+				</do_if>
+				<do_else>
+					<set_value name="$MainHarasser" exact="player.ship"/>
+					<set_value name="$Target" exact="event.param.$object"/>
+					<set_value name="$HasMission" exact="true"/>
+				</do_else>
+				<set_value name="$Config" exact="md.Betterpiracy_config.Config.$Config"/>
+				<set_value name="$CurrentPhase" exact="'Harass_OperationCreated'"/>
+				<set_value name="$Pressure" exact="0"/>
+				<set_value name="$BailAttemps" exact="0"/>
+				<do_if value="$Target.iscapitalship">
+					<set_value name="$MaxDistance" exact="($Config.{'$keep_pressure_max_distance_lxl'})km"/>
+				</do_if>
+				<do_else>
+					<set_value name="$MaxDistance" exact="($Config.{'$keep_pressure_max_distance_sm'})km"/>
+				</do_else>
+				<set_value name="$MissionStep_DamageShields" exact="1"/>
+				<set_value name="$MissionStep_DamageHull" exact="2"/>
+				<set_value name="$MissionStep_ChaseTarget" exact="3"/>
+				<set_value name="$MissionStep_WaitBailing" exact="4"/>
+				<set_value name="$MissionStep_ClaimShip" exact="5"/>
+				<set_value name="$Harassers" exact="$MainHarasser.subordinates"/>
+				<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- Harass operation created: $MissionCue = %s, $MainHarasser = %s (%s), $Target = %s (%s), $MaxDistance = %s.'.[player.age, $MissionCue, $MainHarasser.knownname, $MainHarasser.idcode, $Target.knownname, $Target.idcode, $MaxDistance]"/>
+			</actions>
+			<cues>
+				<cue name="Harass_Init">
+					<actions>
+						<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_Init` cue.'.[player.age, $MissionCue]"/>
+						<signal_cue_instantly cue="Harass_ChangePhase" param="'createMission'"/>
+					</actions>
+				</cue>
+				<cue name="Harass_Aborted">
+					<conditions>
+						<event_mission_aborted cue="$MissionCue"/>
+					</conditions>
+					<actions>
+						<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_Aborted` cue.'.[player.age, $MissionCue]"/>
+						<signal_cue_instantly cue="Harass_ChangePhase" param="'finish'"/>
+					</actions>
+				</cue>
+				<!-- Library - INIT -->
+				<library name="Harass_CheckTarget">
+					<actions>
+						<do_if value="not $Target.isoperational or $Target.dock or not $MainHarasser.isoperational or $MainHarasser.sector != $Target.sector">
+							<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckTarget` library check failed, operation can not continue: $Target.isoperational = %s, $Target.dock = %s, $MainHarasser.isoperational = %s, $MainHarasser.sector = %s, $Target.sector = %s'.[player.age, $MissionCue, $Target.isoperational, $Target.dock, $MainHarasser.isoperational, $MainHarasser.sector, $Target.sector]"/>
+							<signal_cue_instantly cue="Harass_ChangePhase" param="'finish'"/>
+						</do_if>
+						<do_if value="$Target.owner == faction.ownerless">
+							<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckTarget` library check passed, moving to claim phase: $Target.owner = %s'.[player.age, $MissionCue, $Target.owner]"/>
+							<signal_cue_instantly cue="Harass_ChangePhase" param="'claim'"/>
+						</do_if>
+						<do_if value="$Target.owner == faction.player">
+							<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckTarget` library check passed, moving to finish phase: $Target.owner = %s'.[player.age, $MissionCue, $Target.owner]"/>
+							<signal_cue_instantly cue="Harass_ChangePhase" param="'finish'"/>
+						</do_if>
+					</actions>
+				</library>
+				<library name="Harass_CheckShields">
+					<actions>
+						<do_if value="$Target.shieldpercentage ge $Config.{'$harass_shield_threshold'}">
+							<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckShields` library check failed, rolling back to damageShields phase: $Target.shieldpercentage = %s, $Config.{`$harass_shield_threshold`} = %s'.[player.age, $MissionCue, $Target.shieldpercentage, $Config.{'$harass_shield_threshold'}]"/>
+							<signal_cue_instantly cue="Harass_ChangePhase" param="'damageShields'"/>
+						</do_if>
+					</actions>
+				</library>
+				<library name="Harass_CheckHull">
+					<actions>
+						<do_if value="$BailAttemps ge $Config.{'$harass_bail_attemps_before_late'} and $Target.hullpercentage ge $Config.{'$late_harass_hull_threshold'}">
+							<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckHull` library check failed, rolling back to damageHull phase: $Target.hullpercentage = %s, $BailAttemps = %s, $Config.{`$harass_bail_attemps_before_mid`} = %s, $Config.{`$harass_bail_attemps_before_late`} = %s, $Config.{`$early_harass_hull_threshold`} = %s, $Config.{`$mid_harass_hull_threshold`} = %s, $Config.{`$late_harass_hull_threshold`} = %s'.[player.age, $MissionCue, $Target.hullpercentage, $BailAttemps, $Config.{'$harass_bail_attemps_before_mid'}, $Config.{'$harass_bail_attemps_before_late'}, $Config.{'$early_harass_hull_threshold'}, $Config.{'$mid_harass_hull_threshold'}, $Config.{'$late_harass_hull_threshold'}]"/>
+							<signal_cue_instantly cue="Harass_ChangePhase" param="'damageHull'"/>
+						</do_if>
+						<do_elseif value="$BailAttemps ge $Config.{'$harass_bail_attemps_before_mid'} and $Target.hullpercentage ge $Config.{'$mid_harass_hull_threshold'}">
+							<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckHull` library check failed, rolling back to damageHull phase: $Target.hullpercentage = %s, $BailAttemps = %s, $Config.{`$harass_bail_attemps_before_mid`} = %s, $Config.{`$harass_bail_attemps_before_late`} = %s, $Config.{`$early_harass_hull_threshold`} = %s, $Config.{`$mid_harass_hull_threshold`} = %s, $Config.{`$late_harass_hull_threshold`} = %s'.[player.age, $MissionCue, $Target.hullpercentage, $BailAttemps, $Config.{'$harass_bail_attemps_before_mid'}, $Config.{'$harass_bail_attemps_before_late'}, $Config.{'$early_harass_hull_threshold'}, $Config.{'$mid_harass_hull_threshold'}, $Config.{'$late_harass_hull_threshold'}]"/>
+							<signal_cue_instantly cue="Harass_ChangePhase" param="'damageHull'"/>
+						</do_elseif>
+						<do_elseif value="$Target.hullpercentage ge $Config.{'$early_harass_hull_threshold'}">
+							<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s `Harass_CheckHull` library check failed, rolling back to damageHull phase: $Target.hullpercentage = %s, $BailAttemps = %s, $Config.{`$harass_bail_attemps_before_mid`} = %s, $Config.{`$harass_bail_attemps_before_late`} = %s, $Config.{`$early_harass_hull_threshold`} = %s, $Config.{`$mid_harass_hull_threshold`} = %s, $Config.{`$late_harass_hull_threshold`} = %s'.[player.age, $MissionCue, $Target.hullpercentage, $BailAttemps, $Config.{'$harass_bail_attemps_before_mid'}, $Config.{'$harass_bail_attemps_before_late'}, $Config.{'$early_harass_hull_threshold'}, $Config.{'$mid_harass_hull_threshold'}, $Config.{'$late_harass_hull_threshold'}]"/>
+							<signal_cue_instantly cue="Harass_ChangePhase" param="'damageHull'"/>
+						</do_elseif>
+					</actions>
+				</library>
+				<library name="Harass_CheckDistance">
+					<actions>
+						<set_value name="$HarassersInRange" exact="0"/>
+						<!-- Check if player is close to target -->
+						<do_if value="player.entity.distanceto.{$Target} le $MaxDistance">
+							<set_value name="$HarassersInRange" operation="add"/>
+						</do_if>
+						<!-- Check if harassers are close to target -->
+						<do_all exact="$Harassers.count" counter="$i">
+							<do_if value="$Harassers.{$i}.distanceto.{$Target} le $MaxDistance">
+								<set_value name="$HarassersInRange" operation="add"/>
+							</do_if>
+						</do_all>
+						<do_if value="$HarassersInRange == 0">
+							<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_CheckDistance` library check failed, rolling back to chaseTarget phase: $HarassersInRange = %s'.[player.age, $MissionCue, $HarassersInRange]"/>
+							<signal_cue_instantly cue="Harass_ChangePhase" param="'chaseTarget'"/>
+						</do_if>
+					</actions>
+				</library>
+				<library name="Harass_CheckCrew">
+					<actions>
+						<do_if value="$Target.iscapitalship and $Target.people.count le ($Target.people.capacity * ($Config.{'$harass_lxl_min_crew_left_base'} + ($Config.{'$harass_lxl_min_crew_left_pilot'} * ((15 - $Target.pilot.skill.morale)f / 15.0))) / 100)i">
+							<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_CheckCrew` library check passed, moving to claim phase: $Target.iscapitalship = %s'.[player.age, $MissionCue, $Target.iscapitalship]"/>
+							<signal_cue_instantly cue="Harass_ChangePhase" param="'claim'"/>
+						</do_if>
+					</actions>
+				</library>
+				<!-- Library - END -->
+				<!-- Utility cue to change between phases -->
+				<cue name="Harass_ChangePhase" instantiate="true">
+					<conditions>
+						<event_cue_signalled/>
+					</conditions>
+					<actions>
+						<do_if value="$CurrentPhase">
+							<set_value name="$TargetPhase" exact="event.param"/>
+							<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s changing phase from `%s` to `%s`.'.[player.age, $MissionCue, $CurrentPhase, $TargetPhase]"/>
+							<do_if value="$CurrentPhase != 'Harass_OperationCreated'">
+								<cancel_cue cue="$CurrentPhase"/>
+							</do_if>
+							<set_value name="$CurrentPhase" exact="null"/>
+							<do_if value="$TargetPhase == 'createMission'">
+								<signal_cue cue="Harass_CreateMission"/>
+							</do_if>
+							<do_elseif value="$TargetPhase == 'damageShields'">
+								<signal_cue cue="Harass_DamageShields"/>
+							</do_elseif>
+							<do_elseif value="$TargetPhase == 'damageHull'">
+								<signal_cue cue="Harass_DamageHull"/>
+							</do_elseif>
+							<do_elseif value="$TargetPhase == 'chaseTarget'">
+								<signal_cue cue="Harass_ChaseTarget"/>
+							</do_elseif>
+							<do_elseif value="$TargetPhase == 'waitSurrender'">
+								<signal_cue cue="Harass_WaitForSurrender"/>
+							</do_elseif>
+							<do_elseif value="$TargetPhase == 'claim'">
+								<signal_cue cue="Harass_Claim"/>
+							</do_elseif>
+							<do_elseif value="$TargetPhase == 'finish'">
+								<signal_cue cue="Harass_Finish"/>
+							</do_elseif>
+						</do_if>
+						<do_else>
+							<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s changing phase to `%s` skipped.'.[player.age, $MissionCue, $TargetPhase]"/>
+						</do_else>
+					</actions>
+				</cue>
+				<cue name="Harass_CreateMission" instantiate="true">
+					<conditions>
+						<event_cue_signalled/>
+					</conditions>
+					<actions>
+						<set_value name="$CurrentPhase" exact="this"/>
+						<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_CreateMission` cue.'.[player.age, $MissionCue]"/>
+						<do_if value="$HasMission">
+							<create_mission cue="$MissionCue" name="{61537, 5101}" description="{61537, 5102}" faction="faction.player" type="missiontype.raid">
+								<briefing>
+									<objective step="$MissionStep_DamageShields" action="objective.custom" customaction="{61537, 5103}" text="{61537, 5105}" comment="'Increase pressure: Destroy their shields'"/>
+									<objective step="$MissionStep_DamageHull" action="objective.custom" customaction="{61537, 5103}" text="{61537, 5106}" comment="'Increase pressure: Damage their hull'"/>
+									<objective step="$MissionStep_ChaseTarget" action="objective.approach" text="{61537, 5107}" comment="'Approach: Get closer to your target'"/>
+									<objective step="$MissionStep_WaitBailing" action="objective.custom" customaction="{61537, 5104}" text="{61537, 5108}" comment="'Maintain pressure: Do not kill the target!'"/>
+									<objective step="$MissionStep_ClaimShip" action="objective.claim" text="{61537, 5109}" comment="'Claim: The ship is empty'"/>
+								</briefing>
+							</create_mission>
+						</do_if>
+						<do_else>
+							<create_order id="'Harass'" object="$MainHarasser">
+								<param name="target" value="$Target"/>
+								<param name="harassoperation" value="$MissionCue"/>
+							</create_order>
+							<create_order id="'Attack'" object="$Target" chance="($MainHarasser.pilot.skill.piloting * 100) / 15" immediate="true">
+								<param name="primarytarget" value="$MainHarasser"/>
+								<param name="checkrelation" value="false"/>
+							</create_order>
+						</do_else>
+						<do_all exact="$Harassers.count" counter="$i">
+							<create_order id="'Harass'" object="$Harassers.{$i}">
+								<param name="target" value="$Target"/>
+								<param name="harassoperation" value="$MissionCue"/>
+							</create_order>
+						</do_all>
+						<signal_cue_instantly cue="Harass_ChangePhase" param="'damageShields'"/>
+					</actions>
+				</cue>
+				<cue name="Harass_DamageShields" instantiate="true">
+					<conditions>
+						<event_cue_signalled/>
+					</conditions>
+					<actions>
+						<set_value name="$CurrentPhase" exact="this"/>
+						<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_DamageShields` cue.'.[player.age, $MissionCue]"/>
+					</actions>
+					<cues>
+						<cue name="Harass_DamageShields_Check" instantiate="true" checkinterval="1s">
+							<actions>
+								<include_actions ref="Harass_CheckTarget"/>
+								<signal_objects object="$Target" param="$MissionCue" param2="'harass__attack'"/>
+								<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s --- `Harass_DamageShields_Check` values: $Target.shieldpercentage = %s $Config.{`$harass_shield_threshold`} = %s.'.[player.age, $MissionCue, $Target.shieldpercentage, $Config.{'$harass_shield_threshold'}]"/>
+								<do_if value="$Target.shieldpercentage le ($Config.{'$harass_shield_threshold'} - 10)">
+									<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s --- `Harass_DamageShields_Check` passed, moving to damageHull phase: $Target.shieldpercentage = %s, $Config.{`$harass_shield_threshold`} = %s.'.[player.age, $MissionCue, $Target.shieldpercentage, $Config.{'$harass_shield_threshold'}]"/>
+									<signal_cue_instantly cue="Harass_ChangePhase" param="'damageHull'"/>
+								</do_if>
+								<do_else>
+									<do_if value="$HasMission">
+										<set_objective cue="$MissionCue" step="$MissionStep_DamageShields" action="objective.custom" customaction="{61537, 5103}" text="{61537, 5105}" object="$Target" silent="true">
+											<progress progress="100 - $Target.shieldpercentage" max="100 - ($Config.{'$harass_shield_threshold'} - 10)"/>
+										</set_objective>
+									</do_if>
+								</do_else>
+							</actions>
+						</cue>
+					</cues>
+				</cue>
+				<cue name="Harass_DamageHull" instantiate="true">
+					<conditions>
+						<event_cue_signalled/>
+					</conditions>
+					<actions>
+						<set_value name="$CurrentPhase" exact="this"/>
+						<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_DamageHull` cue.'.[player.age, $MissionCue]"/>
+					</actions>
+					<cues>
+						<cue name="Harass_DamageHull_Check" instantiate="true" checkinterval="1s">
+							<actions>
+								<include_actions ref="Harass_CheckTarget"/>
+								<include_actions ref="Harass_CheckShields"/>
+								<signal_objects object="$Target" param="$MissionCue" param2="'harass__attack'"/>
+								<do_if value="$BailAttemps ge $Config.{'$harass_bail_attemps_before_late'}">
+									<set_value name="$MissedHullThreshold" exact="100 - $Config.{'$late_harass_hull_threshold'}"/>
+								</do_if>
+								<do_elseif value="$BailAttemps ge $Config.{'$harass_bail_attemps_before_mid'}">
+									<set_value name="$MissedHullThreshold" exact="100 - $Config.{'$mid_harass_hull_threshold'}"/>
+								</do_elseif>
+								<do_else>
+									<set_value name="$MissedHullThreshold" exact="100 - $Config.{'$early_harass_hull_threshold'}"/>
+								</do_else>
+								<set_value name="$TargetHullMissed" exact="100 - $Target.hullpercentage"/>
+								<do_if value="$TargetHullMissed ge $MissedHullThreshold">
+									<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s --- `Harass_DamageHull_Check` passed, moving to chaseTarget phase: $Target.hullpercentage = %s, $TargetHullMissed = %s.'.[player.age, $MissionCue, $Target.hullpercentage, $TargetHullMissed]"/>
+									<signal_cue_instantly cue="Harass_ChangePhase" param="'chaseTarget'"/>
+								</do_if>
+								<do_else>
+									<do_if value="$HasMission">
+										<set_objective cue="$MissionCue" step="$MissionStep_DamageHull" action="objective.custom" customaction="{61537, 5103}" text="{61537, 5106}" object="$Target" silent="true">
+											<progress progress="$TargetHullMissed" max="$MissedHullThreshold"/>
+										</set_objective>
+									</do_if>
+								</do_else>
+							</actions>
+						</cue>
+					</cues>
+				</cue>
+				<cue name="Harass_ChaseTarget" instantiate="true">
+					<conditions>
+						<event_cue_signalled/>
+					</conditions>
+					<actions>
+						<set_value name="$CurrentPhase" exact="this"/>
+						<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_ChaseTarget` cue.'.[player.age, $MissionCue]"/>
+						<do_if value="$HasMission">
+							<set_objective cue="$MissionCue" step="$MissionStep_ChaseTarget" action="objective.approach" text="{61537, 5107}" object="$Target" silent="true"/>
+						</do_if>
+					</actions>
+					<cues>
+						<cue name="Harass_ChaseTarget_Check" instantiate="true" checkinterval="1s">
+							<actions>
+								<include_actions ref="Harass_CheckTarget"/>
+								<include_actions ref="Harass_CheckShields"/>
+								<include_actions ref="Harass_CheckHull"/>
+								<signal_objects object="$Target" param="$MissionCue" param2="'harass__chase'"/>
+								<set_value name="$HarassersInRange" exact="0"/>
+								<!-- Check if player is close to target -->
+								<do_if value="player.entity.distanceto.{$Target} le $MaxDistance">
+									<set_value name="$HarassersInRange" operation="add"/>
+								</do_if>
+								<!-- Check if harassers are close to target -->
+								<do_all exact="$Harassers.count" counter="$i">
+									<do_if value="$Harassers.{$i}.distanceto.{$Target} le $MaxDistance">
+										<set_value name="$HarassersInRange" operation="add"/>
+									</do_if>
+								</do_all>
+								<do_if value="$HarassersInRange gt 0">
+									<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s --- `Harass_ChaseTarget_Check` passed, moving to waitSurrender phase: $HarassersInRange = %s.'.[player.age, $MissionCue, $HarassersInRange]"/>
+									<signal_cue_instantly cue="Harass_ChangePhase" param="'waitSurrender'"/>
+								</do_if>
+							</actions>
+						</cue>
+					</cues>
+				</cue>
+				<cue name="Harass_WaitForSurrender" instantiate="true">
+					<conditions>
+						<event_cue_signalled/>
+					</conditions>
+					<actions>
+						<set_value name="$CurrentPhase" exact="this"/>
+						<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_WaitForSurrender` cue.'.[player.age, $MissionCue]"/>
+						<set_value name="$NextBailCheck" exact="player.age + ($Config.{'$keep_pressure_timer'})s"/>
+						<set_value name="$InitialTimeLeft" exact="$NextBailCheck - player.age"/>
+					</actions>
+					<cues>
+						<cue name="Harass_WaitForSurrender_Check" instantiate="true" checkinterval="1s">
+							<actions>
+								<include_actions ref="Harass_CheckTarget"/>
+								<include_actions ref="Harass_CheckCrew"/>
+								<include_actions ref="Harass_CheckShields"/>
+								<include_actions ref="Harass_CheckHull"/>
+								<include_actions ref="Harass_CheckDistance"/>
+								<signal_objects object="$Target" param="$MissionCue" param2="'harass__chase'"/>
+								<set_value name="$CurrentTimeLeft" exact="$NextBailCheck - player.age"/>
+								<do_if value="$HasMission">
+									<set_objective cue="$MissionCue" step="$MissionStep_WaitBailing" action="objective.custom" customaction="{61537, 5104}" text="{61537, 5108}" object="$Target" silent="true">
+										<progress progress="$InitialTimeLeft - $CurrentTimeLeft" max="$InitialTimeLeft"/>
+									</set_objective>
+								</do_if>
+								<do_if value="$CurrentTimeLeft le 0">
+									<set_value name="$NextBailCheck" exact="player.age + ($Config.{'$keep_pressure_timer'})s"/>
+									<set_value name="$Pressure" operation="add"/>
+									<set_value name="$BailAttemps" operation="add"/>
+									<do_if value="$HasMission">
+										<speak actor="player.computer" page="61538" line="[4401, 4402, 4403, 4404, 4405, 4406, 4407, 4408, 4409].random" priority="90"/>
+									</do_if>
+									<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s --- `Harass_WaitForSurrender_Check` passed, triggering bail attemp: $NextBailCheck = %s, $Pressure = %s, $BailAttemps = %s.'.[player.age, $MissionCue, $NextBailCheck, $Pressure, $BailAttemps]"/>
+									<signal_cue_instantly cue="md.Betterpiracy_custom_bail_logic.PlayerOwnedShipHarass" param="$MissionCue"/>
+								</do_if>
+							</actions>
+						</cue>
+					</cues>
+				</cue>
+				<cue name="Harass_Claim" instantiate="true">
+					<conditions>
+						<event_cue_signalled/>
+					</conditions>
+					<actions>
+						<set_value name="$CurrentPhase" exact="this"/>
+						<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_Claim` cue.'.[player.age, $MissionCue]"/>
+						<!-- Give experience to involved ships -->
+						<do_if value="not $HasMission">
+							<apply_experience entity="$MainHarasser.pilot" experience="'BETTER_PIRACY_HARASS'" factor="1.0"/>
+							<apply_experience object="$MainHarasser" experience="'BETTER_PIRACY_HARASS'" role="entityrole.service" factor="1.0"/>
+						</do_if>
+						<do_all exact="$Harassers.count" counter="$i">
+							<apply_experience entity="$Harassers.{$i}.pilot" experience="'BETTER_PIRACY_HARASS'" factor="0.8"/>
+							<apply_experience object="$Harassers.{$i}" experience="'BETTER_PIRACY_HARASS'" role="entityrole.service" factor="0.8"/>
+						</do_all>
+						<!-- Move to the next phase or finish -->
+						<do_if value="$HasMission">
+							<do_if value="$Target.iscapitalship">
+								<set_objective cue="$MissionCue" step="$MissionStep_ClaimShip" action="objective.board" text="{61537, 5110}" object="$Target" silent="true"/>
+							</do_if>
+							<do_else>
+								<set_objective cue="$MissionCue" step="$MissionStep_ClaimShip" action="objective.claim" text="{61537, 5109}" object="$Target" silent="true"/>
+							</do_else>
+						</do_if>
+						<do_else>
+							<signal_cue_instantly cue="Harass_ChangePhase" param="'finish'"/>
+						</do_else>
+					</actions>
+					<cues>
+						<cue name="Harass_Claim_Check" instantiate="true" checkinterval="1s">
+							<actions>
+								<signal_objects object="$Target" param="$MissionCue" param2="'harass__end'"/>
+								<do_if value="$Target.owner == faction.player or not $Target.isoperational">
+									<signal_cue_instantly cue="Harass_ChangePhase" param="'finish'"/>
+								</do_if>
+							</actions>
+						</cue>
+					</cues>
+				</cue>
+				<cue name="Harass_Finish" instantiate="true">
+					<conditions>
+						<event_cue_signalled/>
+					</conditions>
+					<actions>
+						<debug_to_file name="'BetterPiracy'" text="'%s --- Betterpiracy_harass --- %s calling `Harass_Finish` cue.'.[player.age, $MissionCue]"/>
+						<do_all exact="$Harassers.count" counter="$i">
+							<cancel_all_orders object="$Harassers.{$i}"/>
+						</do_all>
+						<do_if value="$HasMission">
+							<remove_mission cue="$MissionCue" type="completed"/>
+						</do_if>
+						<cancel_cue cue="$MissionCue"/>
+					</actions>
+				</cue>
+			</cues>
+		</cue>
+	</cues>
 </mdscript>
diff --git a/md/conversations.xml b/md/conversations.xml
index 9a0f199..bb4bd69 100644
--- a/md/conversations.xml
+++ b/md/conversations.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <diff>
-	<!-- This selector matches line 113 -->
-	<!-- Remove the "Surrender" dialog option -->
-	<remove sel="//do_if[@value='$surrenderoption']"/>
+	<replace sel="//cues/cue[@name='DefaultComm']/actions/do_if[@value='typeof event.object == datatype.component']/@value">0</replace>
 </diff>
diff --git a/md/notifications.xml b/md/notifications.xml
index abbcd9d..f242e52 100644
--- a/md/notifications.xml
+++ b/md/notifications.xml
@@ -21,14 +21,14 @@
 			/>
 		</do_if>
 	</add>
-	
-	<!-- This selector matches line 1012 -->
-	<add sel="//eject_npcs" pos="before">
-		<!-- Reputation hit for doing piracy -->
+
+	<!-- This selector matches line 1141 -->
+	<add sel='//set_value[@name="$damageminpercent"]'	pos="after">
+		<!-- Reputation hit for doing piracy
 		<do_if value="md.Betterpiracy_config.Config.$Config.{'$combat_reputation_hit'} == 1">
-			<!-- Reputation hit disabled until I find a proper way of handling it. -->
-			<!-- <signal_cue_instantly cue="PlayerBoarding" param="[$target, 'boarding started']" /> -->
-		</do_if>
+			 Reputation hit disabled until I find a proper way of handling it.
+			 <signal_cue_instantly cue="PlayerBoarding" param="[$target, 'boarding started']" />
+		</do_if> -->
 
 		<!-- Remove extra damage to hull -->
 		<do_if value="md.Betterpiracy_config.Config.$Config.{'$combat_bailing_pilots_damage_hull'} == 0">
@@ -36,7 +36,7 @@
 		</do_if>
 	</add>
 
-	<!-- This selector matches line 1022 -->
+	<!-- This selector matches line 1217 -->
 	<!-- Remove extra damage to components -->
-	<replace sel="//do_if[@value='$pilotbail?']/do_if[@value='$target.exists']/@value">md.Betterpiracy_config.Config.$Config.{'$combat_bailing_pilots_destroy_components'} == 1 and $target.exists</replace>
+	<replace sel="//do_if[@value='$scuttle and $target.exists']/@value">md.Betterpiracy_config.Config.$Config.{'$combat_bailing_pilots_destroy_components'} == 1 and $target.exists</replace>
 </diff>