diff --git a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
index cd9ea731101..a55d1c0cc2a 100644
--- a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
@@ -81,7 +81,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
 		session = MageFrame.getSession();
 	}
 
-	public void getFeedback(FeedbackMode mode, String message, boolean modal, boolean special, Map<String, Serializable> options) {
+	public void getFeedback(FeedbackMode mode, String message, boolean special, Map<String, Serializable> options) {
 		logger.info("text: " + message);
 		this.lblMessage.setText(message);
 		this.selected = false;
@@ -140,12 +140,12 @@ public class FeedbackPanel extends javax.swing.JPanel {
 		this.revalidate();
 		this.repaint();
 		this.helper.setLinks(btnLeft, btnRight, btnSpecial);
-		if (modal) {
-			this.helper.setVisible(false);
-			startModal();
-		} else {
+//		if (modal) {
+//			this.helper.setVisible(false);
+//			startModal();
+//		} else {
 			this.helper.setVisible(true);
-		}
+//		}
 	}
 
 	private void handleOptions(Map<String, Serializable> options) {
@@ -178,7 +178,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
     }
 
 	public void clear() {
-		stopModal();
+//		stopModal();
 		this.btnLeft.setVisible(false);
 		this.btnRight.setVisible(false);
 		this.btnSpecial.setVisible(false);
@@ -186,53 +186,53 @@ public class FeedbackPanel extends javax.swing.JPanel {
 		logger.debug("feedback - clear");
 	}
 
-	public void clear0() {
-		stopModal();
-	}
+//	public void clear0() {
+//		stopModal();
+//	}
 
-	private synchronized void startModal() {
-
-        try {
-            if (SwingUtilities.isEventDispatchThread()) {
-                EventQueue theQueue = getToolkit().getSystemEventQueue();
-                while (!selected) {
-                    AWTEvent event = theQueue.getNextEvent();
-                    Object source = event.getSource();
-                    boolean dispatch = true;
-
-                    if (event instanceof MouseEvent) {
-                        MouseEvent e = (MouseEvent) event;
-                        MouseEvent m = SwingUtilities.convertMouseEvent((Component) e.getSource(), e, this);
-                        if (!this.contains(m.getPoint()) && e.getID() != MouseEvent.MOUSE_DRAGGED) {
-                            dispatch = false;
-                        }
-                    }
-
-                    if (dispatch) {
-                        if (event instanceof ActiveEvent) {
-                            ((ActiveEvent) event).dispatch();
-                        } else if (source instanceof Component) {
-                            ((Component) source).dispatchEvent(event);
-                        } else if (source instanceof MenuComponent) {
-                            ((MenuComponent) source).dispatchEvent(event);
-                        } else {
-							logger.warn("Unable to dispatch: " + event);
-                        }
-                    }
-                }
-            } else {
-                while (!selected) {
-                    wait();
-                }
-            }
-        } catch (InterruptedException ignored) {
-        }
-
-    }
-
-    private synchronized void stopModal() {
-        notifyAll();
-    }
+//	private synchronized void startModal() {
+//
+//        try {
+//            if (SwingUtilities.isEventDispatchThread()) {
+//                EventQueue theQueue = getToolkit().getSystemEventQueue();
+//                while (!selected) {
+//                    AWTEvent event = theQueue.getNextEvent();
+//                    Object source = event.getSource();
+//                    boolean dispatch = true;
+//
+//                    if (event instanceof MouseEvent) {
+//                        MouseEvent e = (MouseEvent) event;
+//                        MouseEvent m = SwingUtilities.convertMouseEvent((Component) e.getSource(), e, this);
+//                        if (!this.contains(m.getPoint()) && e.getID() != MouseEvent.MOUSE_DRAGGED) {
+//                            dispatch = false;
+//                        }
+//                    }
+//
+//                    if (dispatch) {
+//                        if (event instanceof ActiveEvent) {
+//                            ((ActiveEvent) event).dispatch();
+//                        } else if (source instanceof Component) {
+//                            ((Component) source).dispatchEvent(event);
+//                        } else if (source instanceof MenuComponent) {
+//                            ((MenuComponent) source).dispatchEvent(event);
+//                        } else {
+//							logger.warn("Unable to dispatch: " + event);
+//                        }
+//                    }
+//                }
+//            } else {
+//                while (!selected) {
+//                    wait();
+//                }
+//            }
+//        } catch (InterruptedException ignored) {
+//        }
+//
+//    }
+//
+//    private synchronized void stopModal() {
+//        notifyAll();
+//    }
 	
     /** This method is called from within the constructor to
      * initialize the form.
@@ -368,7 +368,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
 
 	private void btnRightActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRightActionPerformed
 		this.selected = true;
-		clear0();
+//		clear0();
 		if (connectedDialog != null) {
 			connectedDialog.hideDialog();
 		}
@@ -383,7 +383,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
 
 	private void btnLeftActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnLeftActionPerformed
 		this.selected = true;
-		clear0();
+//		clear0();
 		session.sendPlayerBoolean(gameId, true);
 	}//GEN-LAST:event_btnLeftActionPerformed
 
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 424047d392b..2260d9fdb14 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -454,7 +454,7 @@ public class GamePanel extends javax.swing.JPanel {
 
 	public void ask(String question, GameView gameView) {
 		updateGame(gameView);
-		this.feedbackPanel.getFeedback(FeedbackMode.QUESTION, question, true, false, null);
+		this.feedbackPanel.getFeedback(FeedbackMode.QUESTION, question, false, null);
 	}
 
 	public void pickTarget(String message, CardsView cardView, GameView gameView, Set<UUID> targets, boolean required, Map<String, Serializable> options) {
@@ -464,17 +464,17 @@ public class GamePanel extends javax.swing.JPanel {
 			ShowCardsDialog dialog = showCards(message, cardView, required);
 			options0.put("dialog", dialog);
 		}
-		this.feedbackPanel.getFeedback(required?FeedbackMode.INFORM:FeedbackMode.CANCEL, message, false, gameView.getSpecial(), options0);
+		this.feedbackPanel.getFeedback(required?FeedbackMode.INFORM:FeedbackMode.CANCEL, message, gameView.getSpecial(), options0);
 
 	}
 
 	public void inform(String information, GameView gameView) {
 		updateGame(gameView);
-		this.feedbackPanel.getFeedback(FeedbackMode.INFORM, information, false, gameView.getSpecial(), null);
+		this.feedbackPanel.getFeedback(FeedbackMode.INFORM, information, gameView.getSpecial(), null);
 	}
 
     public void endMessage(String message) {
-		this.feedbackPanel.getFeedback(FeedbackMode.END, message, false, false, null);
+		this.feedbackPanel.getFeedback(FeedbackMode.END, message, false, null);
     }
     
 	public int modalQuestion(String message, String title) {
@@ -487,7 +487,7 @@ public class GamePanel extends javax.swing.JPanel {
 
 	public void select(String message, GameView gameView) {
 		updateGame(gameView);
-		this.feedbackPanel.getFeedback(FeedbackMode.SELECT, message, false, gameView.getSpecial(), null);
+		this.feedbackPanel.getFeedback(FeedbackMode.SELECT, message, gameView.getSpecial(), null);
         if (PhaseManager.getInstance().isSkip(gameView, message)) {
             this.feedbackPanel.doClick();
         }
@@ -495,12 +495,12 @@ public class GamePanel extends javax.swing.JPanel {
 
 	public void playMana(String message, GameView gameView) {
 		updateGame(gameView);
-		this.feedbackPanel.getFeedback(FeedbackMode.CANCEL, message, false, gameView.getSpecial(), null);
+		this.feedbackPanel.getFeedback(FeedbackMode.CANCEL, message, gameView.getSpecial(), null);
 	}
 
 	public void playXMana(String message, GameView gameView) {
 		updateGame(gameView);
-		this.feedbackPanel.getFeedback(FeedbackMode.CONFIRM, message, false, gameView.getSpecial(), null);
+		this.feedbackPanel.getFeedback(FeedbackMode.CONFIRM, message, gameView.getSpecial(), null);
 	}
 
 	public void replayMessage(String message) {