diff --git a/src/forge/AbilityFactory_PermanentState.java b/src/forge/AbilityFactory_PermanentState.java
index d7930142f30..c6a212ad203 100644
--- a/src/forge/AbilityFactory_PermanentState.java
+++ b/src/forge/AbilityFactory_PermanentState.java
@@ -5,7 +5,9 @@ import java.util.HashMap;
 import java.util.Random;
 
 public class AbilityFactory_PermanentState {
-	// Untapping
+	// ****************************************
+	// ************** Untapping *****************
+	// ****************************************
 	public static SpellAbility createAbilityUntap(final AbilityFactory AF){
 		final SpellAbility abUntap = new Ability_Activated(AF.getHostCard(), AF.getAbCost(), AF.getAbTgt()){
 			private static final long serialVersionUID = 5445572699000471299L;
@@ -353,31 +355,6 @@ public class AbilityFactory_PermanentState {
 		return dbTap;
 	}
 	
-	public static SpellAbility createDrawbackTapAll(final AbilityFactory AF){
-		final SpellAbility dbTap = new Ability_Sub(AF.getHostCard(), AF.getAbTgt()){
-			private static final long serialVersionUID = -4990932993654533449L;
-			
-			final AbilityFactory af = AF;
-			
-			@Override
-			public String getStackDescription(){
-				return tapAllStackDescription(af, this);
-			}
-			
-			@Override
-			public void resolve() {
-				tapAllResolve(af, this);
-			}
-
-			@Override
-			public boolean chkAI_Drawback() {
-				return tapAllPlayDrawbackAI(af, this);
-			}
-			
-		};
-		return dbTap;
-	}
-	
 	public static String tapStackDescription(AbilityFactory af, SpellAbility sa){
 		// when getStackDesc is called, just build exactly what is happening
 		 StringBuilder sb = new StringBuilder();
@@ -572,7 +549,9 @@ public class AbilityFactory_PermanentState {
 	        }
 		}
 	}
-	
+	// ****************************************
+	// ************** UntapAll *****************
+	// ****************************************
 	public static SpellAbility createAbilityUntapAll(final AbilityFactory AF){
 		final SpellAbility abUntap = new Ability_Activated(AF.getHostCard(), AF.getAbCost(), AF.getAbTgt()){
 			private static final long serialVersionUID = 8914852730903389831L;
@@ -674,6 +653,9 @@ public class AbilityFactory_PermanentState {
 		return sb.toString();
 	}
 	
+	// ****************************************
+	// ************** TapAll *****************
+	// ****************************************
 	public static SpellAbility createAbilityTapAll(final AbilityFactory AF){
 		final SpellAbility abUntap = new Ability_Activated(AF.getHostCard(), AF.getAbCost(), AF.getAbTgt()){
 			private static final long serialVersionUID = -2095140656782946737L;
@@ -721,6 +703,31 @@ public class AbilityFactory_PermanentState {
 		return spUntap;
 	}
 
+	public static SpellAbility createDrawbackTapAll(final AbilityFactory AF){
+		final SpellAbility dbTap = new Ability_Sub(AF.getHostCard(), AF.getAbTgt()){
+			private static final long serialVersionUID = -4990932993654533449L;
+			
+			final AbilityFactory af = AF;
+			
+			@Override
+			public String getStackDescription(){
+				return tapAllStackDescription(af, this);
+			}
+			
+			@Override
+			public void resolve() {
+				tapAllResolve(af, this);
+			}
+
+			@Override
+			public boolean chkAI_Drawback() {
+				return tapAllPlayDrawbackAI(af, this);
+			}
+			
+		};
+		return dbTap;
+	}
+	
 	private static void tapAllResolve(final AbilityFactory af, final SpellAbility sa) {
 		HashMap<String,String> params = af.getMapParams();
 		String DrawBack = params.get("SubAbility");