diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java
index f7ee1e246..845c331be 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java
@@ -257,7 +257,7 @@ public class Armor extends EquipableItem {
 			int n = 1;
 			if (Random.Int( 3 ) == 0) {
 				n++;
-				if (Random.Int( 3 ) == 0) {
+				if (Random.Int( 5 ) == 0) {
 					n++;
 				}
 			}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
index 610d9f97f..be4b3b2fd 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
@@ -248,8 +248,12 @@ public class Ring extends KindofMisc {
 	@Override
 	public Item random() {
 		int n = 1;
-		if (Random.Int(3) == 0)
+		if (Random.Int(3) == 0) {
 			n++;
+			if (Random.Int(5) == 0){
+				n++;
+			}
+		}
 
 		if (Random.Float() < 0.3f) {
 			level = -n;
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
index a594457b0..58fd56ee5 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
@@ -247,12 +247,16 @@ public abstract class Wand extends Item {
 	
 	@Override
 	public Item random() {
-		if (Random.Float() < 0.5f) {
-			upgrade();
-			if (Random.Float() < 0.15f) {
-				upgrade();
+		int n = 0;
+
+		if (Random.Int(2) == 0) {
+			n++;
+			if (Random.Int(5) == 0) {
+				n++;
 			}
 		}
+
+		upgrade( n );
 		
 		return this;
 	}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java
index 3f38fdfbe..ba51dfc4e 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java
@@ -191,7 +191,7 @@ public class Weapon extends KindOfWeapon {
 			int n = 1;
 			if (Random.Int( 3 ) == 0) {
 				n++;
-				if (Random.Int( 3 ) == 0) {
+				if (Random.Int( 5 ) == 0) {
 					n++;
 				}
 			}