diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 05fffb90d..9db0cd967 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1824,171 +1824,6 @@ export default class BattleScene extends SceneBase {
 			modifiers.splice(modifierIndex, 1);
 			if (modifier instanceof PokemonFormChangeItemModifier || modifier instanceof TerastallizeModifier)
 				modifier.apply([ this.getPokemonById(modifier.pokemonId), false ]);
-his.enemyModifiers.indexOf(m), 1);
-		this.updateModifiers(false).then(() => this.updateUIPositions());
-	}
-
-	setModifiersVisible(visible: boolean) {
-		[this.modifierBar, this.enemyModifierBar].map(m => m.setVisible(visible));
-	}
-
-	updateModifiers(player?: boolean, instant?: boolean): Promise<void> {
-		if (player === undefined)
-			player = true;
-		return new Promise(resolve => {
-			const modifiers = player ? this.modifiers : this.enemyModifiers as PersistentModifier[];
-			for (let m = 0; m < modifiers.length; m++) {
-				const modifier = modifiers[m];
-				if (modifier instanceof PokemonHeldItemModifier && !this.getPokemonById((modifier as PokemonHeldItemModifier).pokemonId))
-					modifiers.splice(m--, 1);
-			}
-			for (let modifier of modifiers) {
-				if (modifier instanceof PersistentModifier)
-					(modifier as PersistentModifier).virtualStackCount = 0;
-			}
-
-			const modifiersClone = modifiers.slice(0);
-			for (let modifier of modifiersClone) {
-				if (!modifier.getStackCount())
-					modifiers.splice(modifiers.indexOf(modifier), 1);
-			}
-
-			this.updatePartyForModifiers(player ? this.getParty() : this.getEnemyParty(), instant).then(() => {
-				(player ? this.modifierBar : this.enemyModifierBar).updateModifiers(modifiers);
-				if (!player)
-					this.updateUIPositions();
-				resolve();
-			});
-		});
-	}
-
-	updatePartyForModifiers(party: Pokemon[], instant?: boolean): Promise<void> {
-		return new Promise(resolve => {
-			Promise.allSettled(party.map(p => {
-				if (p.scene)
-					p.calculateStats();
-				return p.updateInfo(instant);
-			})).then(() => resolve());
-		});
-	}
-
-	removeModifier(modifier: PersistentModifier, enemy?: boolean): boolean {
-		const modifiers = !enemy ? this.modifiers : this.enemyModifiers;
-		const modifierIndex = modifiers.indexOf(modifier);
-		if (modifierIndex > -1) {
-			modifiers.splice(modifierIndex, 1);
-			if (modifier instanceof PokemonFormChangeItemModifier || modifier instanceof TerastallizeModifier)
-				modifier.apply([this.getPokemonById(modifier.pokemonId), false]);
-his.enemyModifiers.indexOf(m), 1);
-		this.updateModifiers(false).then(() => this.updateUIPositions());
-	}
-
-	setModifiersVisible(visible: boolean) {
-		[this.modifierBar, this.enemyModifierBar].map(m => m.setVisible(visible));
-	}
-
-	updateModifiers(player?: boolean, instant?: boolean): Promise<void> {
-		if (player === undefined)
-			player = true;
-		return new Promise(resolve => {
-			const modifiers = player ? this.modifiers : this.enemyModifiers as PersistentModifier[];
-			for (let m = 0; m < modifiers.length; m++) {
-				const modifier = modifiers[m];
-				if (modifier instanceof PokemonHeldItemModifier && !this.getPokemonById((modifier as PokemonHeldItemModifier).pokemonId))
-					modifiers.splice(m--, 1);
-			}
-			for (let modifier of modifiers) {
-				if (modifier instanceof PersistentModifier)
-					(modifier as PersistentModifier).virtualStackCount = 0;
-			}
-
-			const modifiersClone = modifiers.slice(0);
-			for (let modifier of modifiersClone) {
-				if (!modifier.getStackCount())
-					modifiers.splice(modifiers.indexOf(modifier), 1);
-			}
-
-			this.updatePartyForModifiers(player ? this.getParty() : this.getEnemyParty(), instant).then(() => {
-				(player ? this.modifierBar : this.enemyModifierBar).updateModifiers(modifiers);
-				if (!player)
-					this.updateUIPositions();
-				resolve();
-			});
-		});
-	}
-
-	updatePartyForModifiers(party: Pokemon[], instant?: boolean): Promise<void> {
-		return new Promise(resolve => {
-			Promise.allSettled(party.map(p => {
-				if (p.scene)
-					p.calculateStats();
-				return p.updateInfo(instant);
-			})).then(() => resolve());
-		});
-	}
-
-	removeModifier(modifier: PersistentModifier, enemy?: boolean): boolean {
-		const modifiers = !enemy ? this.modifiers : this.enemyModifiers;
-		const modifierIndex = modifiers.indexOf(modifier);
-		if (modifierIndex > -1) {
-			modifiers.splice(modifierIndex, 1);
-			if (modifier instanceof PokemonFormChangeItemModifier || modifier instanceof TerastallizeModifier)
-				modifier.apply([this.getPokemonById(modifier.pokemonId), false]);
-his.enemyModifiers.indexOf(m), 1);
-		this.updateModifiers(false).then(() => this.updateUIPositions());
-	}
-
-	setModifiersVisible(visible: boolean) {
-		[this.modifierBar, this.enemyModifierBar].map(m => m.setVisible(visible));
-	}
-
-	updateModifiers(player?: boolean, instant?: boolean): Promise<void> {
-		if (player === undefined)
-			player = true;
-		return new Promise(resolve => {
-			const modifiers = player ? this.modifiers : this.enemyModifiers as PersistentModifier[];
-			for (let m = 0; m < modifiers.length; m++) {
-				const modifier = modifiers[m];
-				if (modifier instanceof PokemonHeldItemModifier && !this.getPokemonById((modifier as PokemonHeldItemModifier).pokemonId))
-					modifiers.splice(m--, 1);
-			}
-			for (let modifier of modifiers) {
-				if (modifier instanceof PersistentModifier)
-					(modifier as PersistentModifier).virtualStackCount = 0;
-			}
-
-			const modifiersClone = modifiers.slice(0);
-			for (let modifier of modifiersClone) {
-				if (!modifier.getStackCount())
-					modifiers.splice(modifiers.indexOf(modifier), 1);
-			}
-
-			this.updatePartyForModifiers(player ? this.getParty() : this.getEnemyParty(), instant).then(() => {
-				(player ? this.modifierBar : this.enemyModifierBar).updateModifiers(modifiers);
-				if (!player)
-					this.updateUIPositions();
-				resolve();
-			});
-		});
-	}
-
-	updatePartyForModifiers(party: Pokemon[], instant?: boolean): Promise<void> {
-		return new Promise(resolve => {
-			Promise.allSettled(party.map(p => {
-				if (p.scene)
-					p.calculateStats();
-				return p.updateInfo(instant);
-			})).then(() => resolve());
-		});
-	}
-
-	removeModifier(modifier: PersistentModifier, enemy?: boolean): boolean {
-		const modifiers = !enemy ? this.modifiers : this.enemyModifiers;
-		const modifierIndex = modifiers.indexOf(modifier);
-		if (modifierIndex > -1) {
-			modifiers.splice(modifierIndex, 1);
-			if (modifier instanceof PokemonFormChangeItemModifier || modifier instanceof TerastallizeModifier)
-				modifier.apply([this.getPokemonById(modifier.pokemonId), false]);
 			return true;
 		}
 
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 869c2a448..0639e2f0c 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -70,7 +70,10 @@ export class ModifierType {
       return this.tier;
     if (!this.id)
       return null;
-    let poolTypes: Modifier        poolTypes = [ poolType, ModifierPoolType.TRAINER, ModifierPoolType.WILD ];
+    let poolTypes: ModifierPoolType[];
+    switch (poolType) {
+      case ModifierPoolType.PLAYER:
+        poolTypes = [ poolType, ModifierPoolType.TRAINER, ModifierPoolType.WILD ];
         break;
       case ModifierPoolType.WILD:
         poolTypes = [ poolType, ModifierPoolType.PLAYER, ModifierPoolType.TRAINER ];
@@ -812,9 +815,9 @@ export const modifierTypes = {
   PP_UP: () => new PokemonPpUpModifierType('PP Up', 1),
   PP_MAX: () => new PokemonPpUpModifierType('PP Max', 3),
 
-  REPEL: () => new DoubleBattleChanceBoosterModifierType('Repel', 5),
-  SUPER_REPEL: () => new DoubleBattleChanceBoosterModifierType('Super Repel', 10),
-  MAX_REPEL: () => new DoubleBattleChanceBoosterModifierType('Max Repel', 25),
+  REPEL: () => new DoubleBattleChancePreventerModifierType('Repel', 5),
+  SUPER_REPEL: () => new DoubleBattleChancePreventerModifierType('Super Repel', 10),
+  MAX_REPEL: () => new DoubleBattleChancePreventerModifierType('Max Repel', 25),
 
   LURE: () => new DoubleBattleChanceBoosterModifierType('Lure', 5),
   SUPER_LURE: () => new DoubleBattleChanceBoosterModifierType('Super Lure', 10),
@@ -991,7 +994,15 @@ const modifierPool: ModifierPool = {
       const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && p.getMoveset().filter(m => (m.getMove().pp - m.ppUsed) <= 5).length).length, 3);
       return thresholdPartyMemberCount;
     }, 3),
-    new WeightedModifierType(modifierTypes.LURE, 2),
+    new WeightedModifierType(modifierTypes.REPEL, (party: Pokemon[]) => {
+      const existingItem = party[0].scene.findModifier(m => m.type instanceof DoubleBattleChancePreventerModifierType || m.type instanceof DoubleBattleChanceBoosterModifierType);
+      //return existingItem ? 0 : 2;
+      return 10000
+    }),
+    new WeightedModifierType(modifierTypes.LURE, (party: Pokemon[]) => {
+      const existingItem = party[0].scene.findModifier(m => m.type instanceof DoubleBattleChancePreventerModifierType || m.type instanceof DoubleBattleChanceBoosterModifierType);
+      return existingItem ? 0 : 2;
+    }),
     new WeightedModifierType(modifierTypes.TEMP_STAT_BOOSTER, 4),
     new WeightedModifierType(modifierTypes.BERRY, 2),
     new WeightedModifierType(modifierTypes.TM_COMMON, 1),
@@ -1040,7 +1051,7 @@ const modifierPool: ModifierPool = {
       return existingItem ? 0 : 4;
     }),
     new WeightedModifierType(modifierTypes.SUPER_LURE, (party: Pokemon[]) => {
-      const existingItem = party[0].scene.findModifier(m => m.type instanceof DoubleBattleChanceBoosterModifierType || m.type instanceof DoubleBattleChanceBoosterModifierType);
+      const existingItem = party[0].scene.findModifier(m => m.type instanceof DoubleBattleChancePreventerModifierType || m.type instanceof DoubleBattleChanceBoosterModifierType);
       return existingItem ? 0 : 4;
     }),
     new WeightedModifierType(modifierTypes.NUGGET, 5),
@@ -1061,7 +1072,14 @@ const modifierPool: ModifierPool = {
   ].map(m => { m.setTier(ModifierTier.GREAT); return m; }),
   [ModifierTier.ULTRA]: [
     new WeightedModifierType(modifierTypes.ULTRA_BALL, 24),
-    new WeightedModifierType(modifierTypes.MAX_LURE, 4),
+    new WeightedModifierType(modifierTypes.MAX_REPEL, (party: Pokemon[]) => {
+      const existingItem = party[0].scene.findModifier(m => m.type instanceof DoubleBattleChancePreventerModifierType || m.type instanceof DoubleBattleChanceBoosterModifierType);
+      return existingItem ? 0 : 4;
+    }),
+    new WeightedModifierType(modifierTypes.MAX_LURE, (party: Pokemon[]) => {
+      const existingItem = party[0].scene.findModifier(m => m.type instanceof DoubleBattleChancePreventerModifierType || m.type instanceof DoubleBattleChanceBoosterModifierType);
+      return existingItem ? 0 : 4;
+    }),
     new WeightedModifierType(modifierTypes.BIG_NUGGET, 12),
     new WeightedModifierType(modifierTypes.PP_UP, 9),
     new WeightedModifierType(modifierTypes.PP_MAX, 3),
@@ -1539,85 +1557,6 @@ export function getPartyLuckValue(party: Pokemon[]): integer {
 
 export function getLuckString(luckValue: integer): string {
   return [ 'D', 'C', 'C+', 'B-', 'B', 'B+', 'A-', 'A', 'A+', 'A++', 'S', 'S+', 'SS', 'SS+', 'SSS' ][luckValue];
- (modifierType instanceof ModifierTypeGenerator) {
-    modifierType = (modifierType as ModifierTypeGenerator).generateType(party);
-    if (modifierType === null) {
-      if (player)
-        console.log(ModifierTier[tier], upgradeCount);
-      return getNewModifierTypeOption(party, poolType, tier, upgradeCount, ++retryCount);
-    }
-  }
-
-  console.log(modifierType, !player ? '(enemy)' : '');
-
-  return new ModifierTypeOption(modifierType as ModifierType, upgradeCount);
-}
-
-export function getDefaultModifierTypeForTier(tier: ModifierTier): ModifierType {
-  let modifierType: ModifierType | WeightedModifierType = modifierPool[tier || ModifierTier.COMMON][0];
-  if (modifierType instanceof WeightedModifierType)
-    modifierType = (modifierType as WeightedModifierType).modifierType;
-  return modifierType;
-}
-
-export class ModifierTypeOption {
-  public type: ModifierType;
-  public upgradeCount: integer;
-  public cost: integer;
-
-  constructor(type: ModifierType, upgradeCount: integer, cost: number = 0) {
-    this.type = type;
-    this.upgradeCount = upgradeCount;
-    this.cost = Math.min(Math.round(cost), Number.MAX_SAFE_INTEGER);
-  }
-}
-
-export function getPartyLuckValue(party: Pokemon[]): integer {
-  return Phaser.Math.Clamp(party.map(p => p.isFainted() ? 0 : p.getLuck())
-    .reduce((total: integer, value: integer) => total += value, 0), 0, 14);
-}
-
-export function getLuckString(luckValue: integer): string {
-  return ['D', 'C', 'C+', 'B-', 'B', 'B+', 'A-', 'A', 'A+', 'A++', 'S', 'S+', 'SS', 'SS+', 'SSS'][luckValue];
- (modifierType as ModifierTypeGenerator).generateType(party);
-    if (modifierType === null) {
-      if (player)
-        console.log(ModifierTier[tier], upgradeCount);
-      return getNewModifierTypeOption(party, poolType, tier, upgradeCount, ++retryCount);
-    }
-  }
-
-  console.log(modifierType, !player ? '(enemy)' : '');
-
-  return new ModifierTypeOption(modifierType as ModifierType, upgradeCount);
-}
-
-export function getDefaultModifierTypeForTier(tier: ModifierTier): ModifierType {
-  let modifierType: ModifierType | WeightedModifierType = modifierPool[tier || ModifierTier.COMMON][0];
-  if (modifierType instanceof WeightedModifierType)
-    modifierType = (modifierType as WeightedModifierType).modifierType;
-  return modifierType;
-}
-
-export class ModifierTypeOption {
-  public type: ModifierType;
-  public upgradeCount: integer;
-  public cost: integer;
-
-  constructor(type: ModifierType, upgradeCount: integer, cost: number = 0) {
-    this.type = type;
-    this.upgradeCount = upgradeCount;
-    this.cost = Math.min(Math.round(cost), Number.MAX_SAFE_INTEGER);
-  }
-}
-
-export function getPartyLuckValue(party: Pokemon[]): integer {
-  return Phaser.Math.Clamp(party.map(p => p.isFainted() ? 0 : p.getLuck())
-    .reduce((total: integer, value: integer) => total += value, 0), 0, 14);
-}
-
-export function getLuckString(luckValue: integer): string {
-  return ['D', 'C', 'C+', 'B-', 'B', 'B+', 'A-', 'A', 'A+', 'A++', 'S', 'S+', 'SS', 'SS+', 'SSS'][luckValue];
 }
 
 export function getLuckTextTint(luckValue: integer): integer {