diff --git a/ENI2/EditControls/EditWasteDialog.xaml b/ENI2/EditControls/EditWasteDialog.xaml
index 33f929b9..455a9cbe 100644
--- a/ENI2/EditControls/EditWasteDialog.xaml
+++ b/ENI2/EditControls/EditWasteDialog.xaml
@@ -38,11 +38,11 @@
         <Label Name="labelWasteCodeText" Grid.Row="0" Grid.Column="2" />
         <TextBox Name="textBoxDescription" Grid.Row="1" Grid.Column="1" Margin="2" Grid.ColumnSpan="2" Width="auto" MaxLength="99" TextWrapping="Wrap" />
 
-        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownAmountDisposed" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
-        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownMaxCapacity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
-        <xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" Name="doubleUpDownAmountRetained" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownAmountDisposed" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left" />
+        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownMaxCapacity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left" Maximum="10000"/>
+        <xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" Name="doubleUpDownAmountRetained" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left" Maximum="10000"/>
         <enictrl:LocodeControl Grid.Row="5" Grid.Column="1" x:Name="locodePortOfDeliveryRemainingWaste" LocodeSource="SSN" />
-        <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownAmountGeneratedTilNextPort" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownAmountGeneratedTilNextPort" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left" Maximum="10000"/>
 
         <Label Content="{x:Static p:Resources.textCubicMeters}" Grid.Row = "2" Grid.Column="2" />
         <Label Content="{x:Static p:Resources.textCubicMeters}" Grid.Row = "3" Grid.Column="2" />
diff --git a/ENI2/EditControls/EditWasteReceivedDialog.xaml b/ENI2/EditControls/EditWasteReceivedDialog.xaml
index 21f99c39..c8f8af02 100644
--- a/ENI2/EditControls/EditWasteReceivedDialog.xaml
+++ b/ENI2/EditControls/EditWasteReceivedDialog.xaml
@@ -26,7 +26,7 @@
 
         <ComboBox Name="comboBoxWasteCode" Grid.Row="0" Grid.Column="1" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" />
         <TextBox Name="textBoxDescription" Grid.Row="1" Margin="2" Grid.Column="1" Width="auto" MaxLength="99" TextWrapping="Wrap" />
-        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownAmountReceived" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
+        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownAmountReceived" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left" Maximum="10000"/>
 
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/bsmd.database/Waste.cs b/bsmd.database/Waste.cs
index eadad093..191a7fd6 100644
--- a/bsmd.database/Waste.cs
+++ b/bsmd.database/Waste.cs
@@ -254,17 +254,17 @@ namespace bsmd.database
             if (!this.HasValidWasteCode)
                 violations.Add(RuleEngine.CreateViolation(ValidationCode.V784, "WasteCode", null, this.Title, this.Identifier, this.Tablename));
 
-            if (this.WasteDisposalAmount_MTQ > 10000)
-                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Waste disposal amount", null, this.Title, this.Identifier, this.Tablename));
+            if (this.WasteDisposalAmount_MTQ >= 10000)
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Waste disposal amount too high", null, this.Title, this.Identifier, this.Tablename));
 
-            if (this.WasteCapacity_MTQ > 10000)
-                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Waste capacity", null, this.Title, this.Identifier, this.Tablename));
+            if (this.WasteCapacity_MTQ >= 10000)
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Waste capacity too high", null, this.Title, this.Identifier, this.Tablename));
 
-            if (this.WasteAmountRetained_MTQ > 10000)
-                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Waste amount retained", null, this.Title, this.Identifier, this.Tablename));
+            if (this.WasteAmountRetained_MTQ >= 10000)
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Waste amount retained too high", null, this.Title, this.Identifier, this.Tablename));
 
-            if (this.WasteAmountGeneratedTillNextPort_MTQ > 10000)
-                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Waste generated till next port", null, this.Title, this.Identifier, this.Tablename));
+            if (this.WasteAmountGeneratedTillNextPort_MTQ >= 10000)
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Waste generated till next port too high", null, this.Title, this.Identifier, this.Tablename));
 
             if(this.WasteDisposalAmount_MTQ > this.WasteCapacity_MTQ)
                 violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Disposal greater than capacity!", null, this.Title, this.Identifier, this.Tablename));
diff --git a/bsmd.database/WasteReceived.cs b/bsmd.database/WasteReceived.cs
index 76e4244b..ca19eec9 100644
--- a/bsmd.database/WasteReceived.cs
+++ b/bsmd.database/WasteReceived.cs
@@ -136,8 +136,8 @@ namespace bsmd.database
 
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
         {
-            if (this.AmountWasteReceived_MTQ > 10000)
-                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Waste disposal amount too big", null, this.Title, this.Identifier, this.Tablename));
+            if (this.AmountWasteReceived_MTQ >= 10000)
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Waste disposal amount too high", null, this.Title, this.Identifier, this.Tablename));
         }
 
         #endregion