diff --git a/README.md b/README.md
index 0c82d4b..9ddbd90 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,8 @@ Added more than 20 configuration options to let you tune the mod to your likings
  - https://text2voice.org, https://twistedwave.com/online and https://voicechanger.io/ -> All of them used to create the custom dialog lines.
 
 ## Changelog
+### 0.9.0
+ - Improved logic to avoid having boarding pods orbiting ship when using marines to claim a ship
 ### 0.8.0
  - When using marines to claim a ship, the boarding pod will use the travel drive
  - Improved logic to avoid having boarding pods orbiting ship when using marines to claim a ship
diff --git a/aiscripts/move.claim.xml b/aiscripts/move.claim.xml
index 59be14e..c80af30 100644
--- a/aiscripts/move.claim.xml
+++ b/aiscripts/move.claim.xml
@@ -2,12 +2,16 @@
 <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[4]/do_if[1]"/>
-	<remove sel="/aiscript/attention[@min='visible']/actions/do_if[5]/do_if[1]"/>
+	<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']"/>
 
 	<!-- Avoid having marines looping arround the target -->
 	<!-- This selector matches lines 31 -->
-	<replace sel="//move_to[@flightbehaviour='flightbehaviour.default']">
+	<add sel="//move_to[@flightbehaviour='flightbehaviour.default']" type="@chance">0</add>
+	<!-- This selector matches lines 43 -->
+	<remove sel="//disable_collision_response"/>
+	<!-- This selector matches lines 59 -->
+	<replace sel="//move_to[@flightbehaviour='flightbehaviour.droneattach']">
 		<move_to
 			destination="$target"
 			object="this.ship"
@@ -24,10 +28,5 @@
 			</interrupt>
 		</move_to>
 		<stop_moving object="this.ship"/>
-		<resume label="better_piracy_skip"/>
 	</replace>
-	<!-- This selector matches lines 66 -->
-	<add sel="//attach_object_to_target" pos="before">
-		<label name="better_piracy_skip"/>
-	</add>
 </diff>
diff --git a/content.xml b/content.xml
index 26fd2a8..6ace7df 100644
--- a/content.xml
+++ b/content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<content id="ws_2056100433" name="Better piracy" description="X4 Foundations mod to improve piracy." version="800" save="0" author="alberto-rota" date="2020-04-29" sync="false" lastupdate="1588187607">
+<content id="ws_2056100433" name="Better piracy" description="X4 Foundations mod to improve piracy." version="900" save="0" author="alberto-rota" date="2020-05-03" sync="false" lastupdate="1588525692">
   <langugage language="7" description="X4 Foundations mod to improve piracy."/>
   <langugage language="33" description="X4 Foundations mod to improve piracy."/>
   <langugage language="34" description="Mod para X4 Foundations que mejora la piratería."/>