diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
index e76fdf45948..d0915e90a92 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
@@ -126,9 +126,6 @@ public enum CMatchUI implements ICDoc, IMenuProvider, IMatchController {
         view.getLblAvatar().getResizeTimer().start();
     }
 
-    /**
-     * Instantiates at a match.
-     */
     public void initMatch(final List<PlayerView> sortedPlayers0, final boolean allHands0) {
         sortedPlayers = sortedPlayers0;
         allHands = allHands0;
@@ -185,15 +182,12 @@ public enum CMatchUI implements ICDoc, IMenuProvider, IMatchController {
      * Resets all phase buttons in all fields to "inactive", so highlight won't
      * be drawn on them. "Enabled" state remains the same.
      */
-    // This method is in the top-level controller because it affects ALL fields
-    // (not just one).
     public void resetAllPhaseButtons() {
         for (final VField v : view.getFieldViews()) {
             v.getPhaseIndicator().resetPhaseButtons();
         }
     }
 
-    /** @param s0 &emsp; {@link java.lang.String} */
     public void showMessage(final String s0) {
         CPrompt.SINGLETON_INSTANCE.setMessage(s0);
     }
@@ -360,33 +354,21 @@ public enum CMatchUI implements ICDoc, IMenuProvider, IMatchController {
         }
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.menubar.IMenuProvider#getMenus()
-     */
     @Override
     public List<JMenu> getMenus() {
         return new CMatchUIMenus().getMenus();
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.framework.ICDoc#getCommandOnSelect()
-     */
     @Override
     public UiCommand getCommandOnSelect() {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.framework.ICDoc#initialize()
-     */
     @Override
     public void initialize() {
         Singletons.getControl().getForgeMenu().setProvider(this);
     }
 
-    /* (non-Javadoc)
-     * @see forge.gui.framework.ICDoc#update()
-     */
     @Override
     public void update() { }
 
@@ -671,8 +653,7 @@ public enum CMatchUI implements ICDoc, IMenuProvider, IMatchController {
     }
 
     /**
-     * TODO: Needs to be reworked for efficiency with rest of prefs saves in
-     * codebase.
+     * TODO: Needs to be reworked for efficiency with rest of prefs saves in codebase.
      */
     public void writeMatchPreferences() {
         final ForgePreferences prefs = FModel.getPreferences();
@@ -712,8 +693,7 @@ public enum CMatchUI implements ICDoc, IMenuProvider, IMatchController {
     }
 
     /**
-     * TODO: Needs to be reworked for efficiency with rest of prefs saves in
-     * codebase.
+     * TODO: Needs to be reworked for efficiency with rest of prefs saves in codebase.
      */
     private void actuateMatchPreferences() {
         final ForgePreferences prefs = FModel.getPreferences();
diff --git a/forge-gui/CHANGES.txt b/forge-gui/CHANGES.txt
index acfbd476eaf..f353bbfad7e 100644
--- a/forge-gui/CHANGES.txt
+++ b/forge-gui/CHANGES.txt
@@ -8,7 +8,12 @@ Forge Beta: 11-#-2014 ver 1.5.31
 Release Notes
 -------------
 
-
+- Optimized Default Phase Stops -
+The default phase stops have been reduced from all 24 to just 6:
+- Player: Main Phase 1, Declare Blockers, Main Phase 2 (M1, DB, M2)
+- Opponent: Beginning of Combat, Declare Blockers, End of Turn (BC, DB, ET)
+This should optimize the out-of-the-box experience for users and help new users figure out when the optimal time to cast instant-speed effects is.
+You can still customize these by clicking on the phase stop indicator, and your customizations will be remembered.
 
 
 ---------
diff --git a/forge-gui/src/main/java/forge/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/properties/ForgePreferences.java
index 6aa4d686a12..602f0db2a6d 100644
--- a/forge-gui/src/main/java/forge/properties/ForgePreferences.java
+++ b/forge-gui/src/main/java/forge/properties/ForgePreferences.java
@@ -105,31 +105,31 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
         DECKGEN_ARTIFACTS ("false"),
         DECKGEN_NOSMALL ("false"),
 
-        PHASE_AI_UPKEEP ("true"),
-        PHASE_AI_DRAW ("true"),
-        PHASE_AI_MAIN1 ("true"),
+        PHASE_AI_UPKEEP ("false"),
+        PHASE_AI_DRAW ("false"),
+        PHASE_AI_MAIN1 ("false"),
         PHASE_AI_BEGINCOMBAT ("true"),
-        PHASE_AI_DECLAREATTACKERS ("true"),
+        PHASE_AI_DECLAREATTACKERS ("false"),
         PHASE_AI_DECLAREBLOCKERS ("true"),
-        PHASE_AI_FIRSTSTRIKE ("true"),
-        PHASE_AI_COMBATDAMAGE ("true"),
-        PHASE_AI_ENDCOMBAT ("true"),
-        PHASE_AI_MAIN2 ("true"),
+        PHASE_AI_FIRSTSTRIKE ("false"),
+        PHASE_AI_COMBATDAMAGE ("false"),
+        PHASE_AI_ENDCOMBAT ("false"),
+        PHASE_AI_MAIN2 ("false"),
         PHASE_AI_EOT ("true"),
-        PHASE_AI_CLEANUP ("true"),
+        PHASE_AI_CLEANUP ("false"),
 
-        PHASE_HUMAN_UPKEEP ("true"),
-        PHASE_HUMAN_DRAW ("true"),
+        PHASE_HUMAN_UPKEEP ("false"),
+        PHASE_HUMAN_DRAW ("false"),
         PHASE_HUMAN_MAIN1 ("true"),
-        PHASE_HUMAN_BEGINCOMBAT ("true"),
-        PHASE_HUMAN_DECLAREATTACKERS ("true"),
+        PHASE_HUMAN_BEGINCOMBAT ("false"),
+        PHASE_HUMAN_DECLAREATTACKERS ("false"),
         PHASE_HUMAN_DECLAREBLOCKERS ("true"),
-        PHASE_HUMAN_FIRSTSTRIKE ("true"),
-        PHASE_HUMAN_COMBATDAMAGE ("true"),
-        PHASE_HUMAN_ENDCOMBAT ("true"),
+        PHASE_HUMAN_FIRSTSTRIKE ("false"),
+        PHASE_HUMAN_COMBATDAMAGE ("false"),
+        PHASE_HUMAN_ENDCOMBAT ("false"),
         PHASE_HUMAN_MAIN2 ("true"),
-        PHASE_HUMAN_EOT ("true"),
-        PHASE_HUMAN_CLEANUP ("true"),
+        PHASE_HUMAN_EOT ("false"),
+        PHASE_HUMAN_CLEANUP ("false"),
 
         SHORTCUT_SHOWSTACK ("83"),
         SHORTCUT_SHOWCOMBAT ("67"),