diff --git a/app/build.gradle b/app/build.gradle
index 0e07c31d3..3be516aca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -90,6 +90,7 @@ repositories {
     // Added the custom Maven repository for utilcode
     maven {
         url 'http://maven.xdja.com:8081/nexus3/repository/aliyun/'
+        allowInsecureProtocol = true
     }
 }
 
diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaManager.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaManager.java
index 9b7ea5a43..dd26e6eef 100644
--- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaManager.java
+++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaManager.java
@@ -246,7 +246,7 @@ public String mapSoundPackage(CTutor tTutor, String packageName, String langOver
         catch(Exception e) {
             soundPackage = autoLang;
         }
-
+        Log.d(TAG, "Resolved soundPackage = " + soundPackage);
         return soundPackage;
     }
 
@@ -285,7 +285,7 @@ public String mapPackagePath(CTutor tTutor, String packageName) {
         catch(Exception e) {
             packagePath = TCONST.BASE_ASSETS;
         }
-
+        Log.d(TAG, "Resolved packagePath = " + packagePath);
         return packagePath;
     }
 
@@ -324,7 +324,7 @@ public String mapPackageLocation(CTutor tTutor, String packageName) {
         catch(Exception e) {
             packageLocation = TCONST.EXTERNAL;
         }
-
+        Log.d(TAG, "Resolved packageLocation = " + packageLocation);
         return packageLocation;
     }
 
diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CycleMatrixActivityMenu.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CycleMatrixActivityMenu.java
index 944cf22ec..f16999d4a 100644
--- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CycleMatrixActivityMenu.java
+++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/CycleMatrixActivityMenu.java
@@ -35,15 +35,26 @@ public class CycleMatrixActivityMenu implements IActivityMenu {
 
     TransitionMatrixModel _matrix;
     IStudentDataModel _student;
+    PromotionMechanism _promotionMechanism;
+    private static final int MIN_NUM_ATTEMPTS = 3;
 
     public CycleMatrixActivityMenu(TransitionMatrixModel matrix, IStudentDataModel student) {
         this._matrix = matrix;
         this._student = student;
+        this._promotionMechanism = new PromotionMechanism(this._student, this._matrix);
     }
 
     @Override
     public String getLayoutName() {
-        return "ask_activity_selector_2x2";
+        if(this._promotionMechanism.performance.getNumberAttempts() >= MIN_NUM_ATTEMPTS
+                &&
+                this._promotionMechanism.performance.getTotalNumberQuestions() >= 3
+                &&
+                this._promotionMechanism.performance.getNumberCorrect() / this._promotionMechanism.performance.getNumberAttempts() > PlacementPromotionRules.HIGH_PERFORMANCE_THRESHOLD
+        )
+            return "ask_activity_selector_2x2_elevate";
+        else
+            return "ask_activity_selector_2x2";
     }
 
     @Override
@@ -99,9 +110,62 @@ public CAt_Data[] getTutorsToShow() {
             Log.e("SUPER_PLACEMENT", "not ready yet");
             nextTutors[0] = (CAt_Data) transitionMap.get(tutorId);
             nextTutors[1] = nextTutors[0];
+
+            // Add null check for nextTutors[0]
+            if (nextTutors[0] == null) {
+                Log.e(MENU_BUG_TAG, "Could not find tutor with ID: " + tutorId + " in placement mode");
+                // Try to get root tutor as fallback
+                String rootTutor = "";
+                switch(_student.getActiveSkill()) {
+                    case SELECT_WRITING:
+                        rootTutor = _matrix.getRootSkillByContentArea(SELECT_WRITING);
+                        break;
+                    case SELECT_STORIES:
+                        rootTutor = _matrix.getRootSkillByContentArea(SELECT_STORIES);
+                        break;
+                    case SELECT_MATH:
+                        rootTutor = _matrix.getRootSkillByContentArea(SELECT_MATH);
+                        break;
+                }
+                nextTutors[0] = (CAt_Data) transitionMap.get(rootTutor);
+                nextTutors[1] = nextTutors[0];
+            }
         } else {
             nextTutors[0] = (CAt_Data) transitionMap.get(tutorId); // N
-            nextTutors[1] = isPlacementMode ? nextTutors[0] : (CAt_Data) transitionMap.get(nextTutors[0].next); // N or N + 1
+
+            // Add null checking here
+            if (nextTutors[0] != null && nextTutors[0].next != null) {
+                CAt_Data nextTutor = (CAt_Data) transitionMap.get(nextTutors[0].next);
+                nextTutors[1] = isPlacementMode ? nextTutors[0] : nextTutor;
+
+                // Add null check for nextTutors[1]
+                if (nextTutors[1] == null) {
+                    nextTutors[1] = nextTutors[0]; // Use the same tutor if next is null
+                    Log.e(MENU_BUG_TAG, "Next tutor is null, using same tutor twice: " + tutorId);
+                }
+            } else {
+                // If there's no valid next tutor, use the same tutor twice
+                if (nextTutors[0] == null) {
+                    Log.e(MENU_BUG_TAG, "Current tutor is null for ID: " + tutorId);
+                    // Try to get root tutor as fallback
+                    String rootTutor = "";
+                    switch(_student.getActiveSkill()) {
+                        case SELECT_WRITING:
+                            rootTutor = _matrix.getRootSkillByContentArea(SELECT_WRITING);
+                            break;
+                        case SELECT_STORIES:
+                            rootTutor = _matrix.getRootSkillByContentArea(SELECT_STORIES);
+                            break;
+                        case SELECT_MATH:
+                            rootTutor = _matrix.getRootSkillByContentArea(SELECT_MATH);
+                            break;
+                    }
+                    nextTutors[0] = (CAt_Data) transitionMap.get(rootTutor);
+                }
+
+                nextTutors[1] = nextTutors[0];
+                Log.d(MENU_BUG_TAG, "No next tutor available, using the same tutor twice");
+            }
         }
 
         return nextTutors;
@@ -142,10 +206,22 @@ public CAsk_Data initializeActiveLayout() {
         activeLayout.items[1].help = "something different";
 
         activeLayout.items[2] =  new CAskElement();
-        activeLayout.items[2].componentID = "SbuttonRepeat";
-        activeLayout.items[2].behavior = AS_CONST.SELECT_REPEAT;
-        activeLayout.items[2].prompt = "lets do it again";
-        activeLayout.items[2].help = "lets do it again";
+        if(this._promotionMechanism.performance.getNumberAttempts() >= MIN_NUM_ATTEMPTS
+                &&
+                this._promotionMechanism.performance.getTotalNumberQuestions() >= 3
+                &&
+                this._promotionMechanism.performance.getNumberCorrect() / this._promotionMechanism.performance.getNumberAttempts() > PlacementPromotionRules.HIGH_PERFORMANCE_THRESHOLD){
+            activeLayout.items[2].componentID = "Sbutton1";
+            activeLayout.items[2].behavior = AS_CONST.ELEVATE;
+            activeLayout.items[2].prompt = "I want something harder";
+            activeLayout.items[2].help = "something harder";
+        }
+        else{
+            activeLayout.items[2].componentID = "SbuttonRepeat";
+            activeLayout.items[2].behavior = AS_CONST.SELECT_REPEAT;
+            activeLayout.items[2].prompt = "lets do it again";
+            activeLayout.items[2].help = "lets do it again";
+        }
 
         activeLayout.items[3] =  new CAskElement();
         activeLayout.items[3].componentID = "SbuttonExit";
@@ -162,7 +238,18 @@ public Map<String, String> getButtonBehaviorMap() {
 
         map.put(SELECT_OPTION_0, AS_CONST.QUEUEMAP_KEYS.BUTTON_BEHAVIOR);
         map.put(SELECT_OPTION_1, AS_CONST.QUEUEMAP_KEYS.BUTTON_BEHAVIOR);
-        map.put(AS_CONST.SELECT_REPEAT, AS_CONST.QUEUEMAP_KEYS.BUTTON_BEHAVIOR);
+
+        if(this._promotionMechanism.performance.getNumberAttempts() >= MIN_NUM_ATTEMPTS
+                &&
+                this._promotionMechanism.performance.getTotalNumberQuestions() >= 3
+                &&
+                this._promotionMechanism.performance.getNumberCorrect() / this._promotionMechanism.performance.getNumberAttempts() > PlacementPromotionRules.HIGH_PERFORMANCE_THRESHOLD){
+            map.put(AS_CONST.ELEVATE, AS_CONST.QUEUEMAP_KEYS.BUTTON_BEHAVIOR);
+        }
+        else{
+            map.put(AS_CONST.SELECT_REPEAT, AS_CONST.QUEUEMAP_KEYS.BUTTON_BEHAVIOR);
+        }
+
         map.put(AS_CONST.SELECT_EXIT, AS_CONST.QUEUEMAP_KEYS.EXIT_BUTTON_BEHAVIOR);
         return map;
     }
@@ -176,7 +263,7 @@ public CAt_Data getTutorToLaunch(String buttonBehavior) {
         String rootTutor = "";
 
         String activeSkill = null;
-        String chosenTutorId;
+        String chosenTutorId = null;
 
         Log.d("OH_BEHAVE", "some behavior here should be different...");
 
@@ -188,12 +275,49 @@ public CAt_Data getTutorToLaunch(String buttonBehavior) {
             transitionMap = _matrix.getTransitionMapByContentArea(activeSkill);
             rootTutor = _matrix.getRootSkillByContentArea(activeSkill);
             RoboTutor.logManager.postEvent_I(REPEAT_DEBUG_TAG, String.format("activeSkill=%s;chosenTutorId=%s;transitionMap=%s;rootTutor=%s", activeSkill, chosenTutorId, activeSkill, rootTutor));
+        }
+        else if (buttonBehavior.equals(AS_CONST.ELEVATE)) {
+            activeSkill = _student.getLastSkill();
+            transitionMap = _matrix.getTransitionMapByContentArea(activeSkill);
+            chosenTutorId = _student.getLastTutor();
 
+            if(activeSkill != null) {
+                // If the last activity is not null then go to that activity but update the placement index by 1
+                if(activeSkill.equals(SELECT_MATH)) {
+                    rootTutor = _matrix.getRootSkillByContentArea(SELECT_MATH);
+                    CAt_Data transitionData = (CAt_Data) transitionMap.get(chosenTutorId);
+                    if (transitionData != null && transitionData.harder != null) {
+                        chosenTutorId = transitionData.harder;
+                    } else {
+                        // If no harder level available, stay at current level
+                        Log.e(MENU_BUG_TAG, "No harder math level available for " + chosenTutorId);
+                    }
+                }
+                else if(activeSkill.equals(SELECT_WRITING)) {
+                    rootTutor = _matrix.getRootSkillByContentArea(SELECT_WRITING);
+                    CAt_Data transitionData = (CAt_Data) transitionMap.get(chosenTutorId);
+                    if (transitionData != null && transitionData.harder != null) {
+                        chosenTutorId = transitionData.harder;
+                    } else {
+                        // If no harder level available, stay at current level
+                        Log.e(MENU_BUG_TAG, "No harder writing level available for " + chosenTutorId);
+                    }
+                }
+                else if(activeSkill.equals(SELECT_STORIES)) {
+                    rootTutor = _matrix.getRootSkillByContentArea(SELECT_STORIES);
+                    CAt_Data transitionData = (CAt_Data) transitionMap.get(chosenTutorId);
+                    if (transitionData != null && transitionData.harder != null) {
+                        chosenTutorId = transitionData.harder;
+                    } else {
+                        // If no harder level available for stories, stay at current level
+                        Log.e(MENU_BUG_TAG, "No harder stories level available for " + chosenTutorId);
+                    }
+                }
+            }
         } else {
-
             activeSkill = _student.getActiveSkill();
             CAt_Data zeroIndexedTutor;
-            String[] nextTutors = new String[3];
+            String[] nextTutorIds = new String[3];
 
             boolean inPlacementMode = false;
 
@@ -206,6 +330,11 @@ public CAt_Data getTutorToLaunch(String buttonBehavior) {
 
                 case SELECT_STORIES:
                     zeroIndexedTutorId = _student.getStoryTutorID();
+                    if (zeroIndexedTutorId == null) {
+                        // If story tutor ID is null, get the root story tutor
+                        zeroIndexedTutorId = _matrix.getRootSkillByContentArea(SELECT_STORIES);
+                        Log.e(MENU_BUG_TAG, "Story tutor ID was null, falling back to root: " + zeroIndexedTutorId);
+                    }
                     Log.d("REPEAT_ME", "storyTutor=" + zeroIndexedTutorId);
                     break;
 
@@ -220,26 +349,79 @@ public CAt_Data getTutorToLaunch(String buttonBehavior) {
             RoboTutor.logManager.postEvent_I(MENU_BUG_TAG, "CycleMatrixActivityMenu: activeSkill=" + activeSkill + " -- activeTutorId=" + zeroIndexedTutorId);
             transitionMap = _matrix.getTransitionMapByContentArea(activeSkill);
             rootTutor = _matrix.getRootSkillByContentArea(activeSkill);
+
+            // Additional safety for stories
+            if (activeSkill != null && activeSkill.equals(SELECT_STORIES) && (transitionMap == null || transitionMap.isEmpty())) {
+                Log.e(MENU_BUG_TAG, "Story transition map is null or empty!");
+                // Create a minimal transition map if none exists
+                if (transitionMap == null) {
+                    transitionMap = new HashMap();
+                }
+                // Make sure the root tutor exists in the map
+                if (rootTutor != null && !transitionMap.containsKey(rootTutor)) {
+                    Log.e(MENU_BUG_TAG, "Adding root story tutor to map as fallback: " + rootTutor);
+                    CAt_Data rootData = new CAt_Data();
+                    rootData.tutor_id = rootTutor;
+                    rootData.next = rootTutor; // Point to itself as fallback
+                    rootData.same = rootTutor;
+                    transitionMap.put(rootTutor, rootData);
+                }
+            }
+
             zeroIndexedTutor = (CAt_Data) transitionMap.get(zeroIndexedTutorId);
-            nextTutors[0] = zeroIndexedTutor.tutor_id;
-            nextTutors[1] = inPlacementMode ? nextTutors[0] : ((CAt_Data) transitionMap.get(zeroIndexedTutor.next)).tutor_id; // next hardest tutor!!! (I don't know WHY this is implemented twice)
+
+            if (zeroIndexedTutor != null) {
+                nextTutorIds[0] = zeroIndexedTutor.tutor_id;
+
+                if (zeroIndexedTutor.next != null) {
+                    CAt_Data nextTutor = (CAt_Data) transitionMap.get(zeroIndexedTutor.next);
+                    nextTutorIds[1] = inPlacementMode ? nextTutorIds[0] : (nextTutor != null ? nextTutor.tutor_id : nextTutorIds[0]);
+
+                    // Initialize nextTutorIds[2] to prevent null when SELECT_OPTION_2 is used
+                    if (nextTutor != null && nextTutor.next != null) {
+                        CAt_Data nextNextTutor = (CAt_Data) transitionMap.get(nextTutor.next);
+                        nextTutorIds[2] = nextNextTutor != null ? nextNextTutor.tutor_id : nextTutorIds[1];
+                    } else {
+                        nextTutorIds[2] = nextTutorIds[1]; // Use previous tutor if no "next next" is available
+                    }
+                } else {
+                    nextTutorIds[1] = nextTutorIds[0];
+                    nextTutorIds[2] = nextTutorIds[0]; // Initialize index 2 as well
+                    Log.d(MENU_BUG_TAG, "No next tutor defined, using the same tutor twice");
+                }
+            } else {
+                // Handle case where zeroIndexedTutor is null
+                Log.e(MENU_BUG_TAG, "Could not find tutor with ID: " + zeroIndexedTutorId);
+                // Use root tutor as fallback
+                CAt_Data rootTutorData = (CAt_Data) transitionMap.get(rootTutor);
+                if (rootTutorData != null) {
+                    nextTutorIds[0] = rootTutorData.tutor_id;
+                    nextTutorIds[1] = rootTutorData.tutor_id;
+                } else {
+                    // Critical error - no valid tutor found
+                    Log.e(MENU_BUG_TAG, "Critical error: No valid tutor found in transition map");
+                    // Set to null and handle later
+                    nextTutorIds[0] = null;
+                    nextTutorIds[1] = null;
+                }
+            }
 
             switch(buttonBehavior.toUpperCase()) {
 
                 case SELECT_OPTION_0: // TRACE_PROMOTION looks good...
-                    chosenTutorId = nextTutors[0];
+                    chosenTutorId = nextTutorIds[0];
                     break;
 
                 case SELECT_OPTION_1: // TRACE_PROMOTION looks good...
                     // launch the next tutor
                     // something like this...
-                    chosenTutorId = nextTutors[1];
+                    chosenTutorId = nextTutorIds[1];
 
                     break;
 
                 case SELECT_OPTION_2:
                     // launch the next.next tutor
-                    chosenTutorId = nextTutors[2];
+                    chosenTutorId = nextTutorIds[2];
                     break;
 
                 default:
@@ -249,7 +431,7 @@ public CAt_Data getTutorToLaunch(String buttonBehavior) {
 
             // If they choose the second option, update our position in thematrix //
             // will only be updated if SELECT_OPTION_1 or SELECT_OPTION_2 were selected //
-            if (!chosenTutorId.equals(zeroIndexedTutorId)) {
+            if (!chosenTutorId.equals(zeroIndexedTutorId) && !buttonBehavior.equals(AS_CONST.ELEVATE)) {
                 switch (activeSkill) {
                     case SELECT_WRITING:
                         _student.updateWritingTutorID(chosenTutorId, true);
@@ -264,12 +446,18 @@ public CAt_Data getTutorToLaunch(String buttonBehavior) {
                         break;
                 }
             }
-
         }
 
 
         // TRACE_PROMOTION doesn't save tutorToLaunch when we choose the second option!!!
         // the next tutor to be launched
+
+        // Final check to ensure chosenTutorId is not null
+        if (chosenTutorId == null) {
+            Log.e(MENU_BUG_TAG, "Critical error: chosenTutorId is null, using root tutor as fallback");
+            chosenTutorId = rootTutor;
+        }
+
         CAt_Data tutorToLaunch = (CAt_Data) transitionMap.get(chosenTutorId);
         Log.wtf(MENU_BUG_TAG, chosenTutorId + " " +  activeSkill);
 
@@ -286,4 +474,4 @@ public CAt_Data getTutorToLaunch(String buttonBehavior) {
     public String getDebugMenuSkill() {
         return RoboTutor.STUDENT_CHOSE_REPEAT ? _student.getLastSkill() : _student.getActiveSkill(); // DEBUG_MENU_LOGIC (x) lastSkill vs ActiveSkill...
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/PromotionMechanism.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/PromotionMechanism.java
index 88b8f7f27..08908be0b 100644
--- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/PromotionMechanism.java
+++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/PromotionMechanism.java
@@ -29,6 +29,13 @@ public class PromotionMechanism {
     private IStudentDataModel _studentModel; // holds the StudentDataModel
     private TransitionMatrixModel _matrix; // now holds the transition map things...
 
+    public static final PerformanceData performance; // `final` ensures it can't be changed
+
+    // Static block to initialize `performance` if it needs to be done in a specific way
+    static {
+        performance = new PerformanceData(); // Initialize here, can be any valid initialization
+    }
+
     public PromotionMechanism(IStudentDataModel studentModel, TransitionMatrixModel matrix) {
         this._studentModel = studentModel;
         this._matrix = matrix;
@@ -156,7 +163,6 @@ private String selectNextTutor(CTutor lastTutorPlayed, String lastSkillPlayed, b
             rules = new PerformancePromotionRules();
         }
 
-        PerformanceData performance = new PerformanceData();
         performance.setActivityType(activeTutorId);
         // look up activeSkill every time?
         performance.setActiveSkill(lastSkillPlayed);
@@ -286,8 +292,8 @@ private String getNextPlacementTutor(String activeTutorId, boolean useMathPlacem
                         // student has made it to the end
                         CPlacementTest_Tutor lastPlacementTest = _matrix.mathPlacement[mathPlacementIndex]; // off-by-one??? they'll never reach it :)
                         // update our preferences to exit PLACEMENT mode
-                        _studentModel.updateMathPlacement(false, false);
-                        _studentModel.updateMathPlacementIndex(null, false);
+                        _studentModel.updateMathPlacement(true, true); //reached end -> jump to promotion
+                        _studentModel.updateMathPlacementIndex(null, true);
 
 
                         _studentModel.saveAll();
@@ -317,8 +323,8 @@ private String getNextPlacementTutor(String activeTutorId, boolean useMathPlacem
                         CPlacementTest_Tutor lastPlacementTest = _matrix.writePlacement[writingPlacementIndex]; // off-by-one??? they'll never reach it :)
                         // update our preferences to exit PLACEMENT mode
 
-                        _studentModel.updateWritingPlacement(false, false);
-                        _studentModel.updateWritingPlacementIndex(null, false); //editor.remove("WRITING_PLACEMENT_INDEX");
+                        _studentModel.updateWritingPlacement(true, true);  // once they reach index lenght, jump to promotion
+                        _studentModel.updateWritingPlacementIndex(null, true); //editor.remove("WRITING_PLACEMENT_INDEX");
 
                         _studentModel.saveAll();
                         return lastPlacementTest.fail; // go to beginning of last level
@@ -353,15 +359,15 @@ private String getNextPlacementTutor(String activeTutorId, boolean useMathPlacem
                 // set prefs.usesThingy to false
                 if(useMathPlacement) {
                     lastPlacementTest = _matrix.mathPlacement[placementIndex];
-                    _studentModel.updateMathPlacement(false, false); // editor.putBoolean(placementKey, false); // no more placement
-                    _studentModel.updateMathPlacementIndex(null, false);
+                    _studentModel.updateMathPlacement(true, true); // editor.putBoolean(placementKey, false); // no more placement
+                    _studentModel.updateMathPlacementIndex(null, true);
 
                 }
                 // useWritePlacement only other option
                 else {
                     lastPlacementTest = _matrix.writePlacement[placementIndex];
-                    _studentModel.updateWritingPlacement(false, false); // editor.putBoolean(placementKey, false); // no more placement
-                    _studentModel.updateWritingPlacementIndex(null, false); // editor.remove(placementIndexKey);
+                    _studentModel.updateWritingPlacement(true, true); //jump to promotion
+                    _studentModel.updateWritingPlacementIndex(null, true); // editor.remove(placementIndexKey);
                 }
 
                 _studentModel.saveAll();
@@ -372,4 +378,4 @@ private String getNextPlacementTutor(String activeTutorId, boolean useMathPlacem
         }
 
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/StudentChooseMatrixActivityMenu.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/StudentChooseMatrixActivityMenu.java
index 30363927d..b2520a5ab 100644
--- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/StudentChooseMatrixActivityMenu.java
+++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/util/StudentChooseMatrixActivityMenu.java
@@ -25,15 +25,27 @@ public class StudentChooseMatrixActivityMenu implements IActivityMenu {
 
     TransitionMatrixModel _matrix;
     IStudentDataModel _student;
-    
+    PromotionMechanism _promotionMechanism;
+    private static final int MIN_NUM_ATTEMPTS = 3;
+
     public StudentChooseMatrixActivityMenu(TransitionMatrixModel matrix, IStudentDataModel student) {
         this._matrix = matrix;
         this._student = student;
+        this._promotionMechanism = new PromotionMechanism(this._student, this._matrix);
     }
 
     @Override
     public String getLayoutName() {
-        return "ask_activity_selector_2x3";
+        if(this._promotionMechanism.performance.getNumberAttempts() >= MIN_NUM_ATTEMPTS
+                &&
+                this._promotionMechanism.performance.getTotalNumberQuestions() >= 3
+                &&
+                this._promotionMechanism.performance.getNumberCorrect() /this._promotionMechanism.performance.getNumberAttempts() > PlacementPromotionRules.HIGH_PERFORMANCE_THRESHOLD
+
+        )
+            return "ask_activity_selector_2x3_elevate";
+        else
+            return "ask_activity_selector_2x3";
     }
 
     @Override
@@ -70,11 +82,23 @@ public CAsk_Data initializeActiveLayout() {
         activeLayout.items[2].help = "numbers and math";
 
 
-        activeLayout.items[3] =  new CAskElement();
-        activeLayout.items[3].componentID = "SbuttonRepeat";
-        activeLayout.items[3].behavior = AS_CONST.SELECT_REPEAT;
-        activeLayout.items[3].prompt = "lets do it again";
-        activeLayout.items[3].help = "lets do it again";
+        activeLayout.items[3] = new CAskElement();
+        if(this._promotionMechanism.performance.getNumberAttempts() >= MIN_NUM_ATTEMPTS
+                &&
+                this._promotionMechanism.performance.getTotalNumberQuestions() >= 3
+                &&
+                this._promotionMechanism.performance.getNumberCorrect() / this._promotionMechanism.performance.getNumberAttempts() > PlacementPromotionRules.HIGH_PERFORMANCE_THRESHOLD){
+            activeLayout.items[3].componentID = "Sbutton1";
+            activeLayout.items[3].behavior = AS_CONST.ELEVATE;
+            activeLayout.items[3].prompt = "something harder";
+            activeLayout.items[3].help = "something harder";
+        }
+        else{
+            activeLayout.items[3].componentID = "SbuttonRepeat";
+            activeLayout.items[3].behavior = AS_CONST.SELECT_REPEAT;
+            activeLayout.items[3].prompt = "lets do it again";
+            activeLayout.items[3].help = "lets do it again";
+        }
 
         activeLayout.items[4] =  new CAskElement();
         activeLayout.items[4].componentID = "SbuttonExit";
@@ -92,7 +116,16 @@ public Map<String, String> getButtonBehaviorMap() {
         map.put(AS_CONST.BEHAVIOR_KEYS.SELECT_WRITING, AS_CONST.QUEUEMAP_KEYS.BUTTON_BEHAVIOR);
         map.put(AS_CONST.BEHAVIOR_KEYS.SELECT_STORIES, AS_CONST.QUEUEMAP_KEYS.BUTTON_BEHAVIOR);
         map.put(AS_CONST.BEHAVIOR_KEYS.SELECT_MATH, AS_CONST.QUEUEMAP_KEYS.BUTTON_BEHAVIOR);
-        map.put(AS_CONST.SELECT_REPEAT, AS_CONST.QUEUEMAP_KEYS.BUTTON_BEHAVIOR);
+        if(this._promotionMechanism.performance.getNumberAttempts() >= MIN_NUM_ATTEMPTS
+                &&
+                this._promotionMechanism.performance.getTotalNumberQuestions() >= 3
+                &&
+                this._promotionMechanism.performance.getNumberCorrect() / this._promotionMechanism.performance.getNumberAttempts() > PlacementPromotionRules.HIGH_PERFORMANCE_THRESHOLD){
+            map.put(AS_CONST.ELEVATE, AS_CONST.QUEUEMAP_KEYS.BUTTON_BEHAVIOR);
+        }
+        else{
+            map.put(AS_CONST.SELECT_REPEAT, AS_CONST.QUEUEMAP_KEYS.BUTTON_BEHAVIOR);
+        }
         map.put(AS_CONST.SELECT_EXIT, AS_CONST.QUEUEMAP_KEYS.EXIT_BUTTON_BEHAVIOR);
         return map;
     }
@@ -103,11 +136,31 @@ public CAt_Data getTutorToLaunch(String buttonBehavior) {
         String activeTutorId = null;
         HashMap transitionMap = null;
         String rootTutor = null;
-
         String activeSkill = null;
-        
+
         // this could seriously be cleaned up...
         switch (buttonBehavior.toUpperCase()) {
+            case AS_CONST.ELEVATE:
+
+                activeSkill = _student.getLastSkill();
+                transitionMap = _matrix.getTransitionMapByContentArea(activeSkill);
+                activeTutorId = _student.getLastTutor();
+
+                if(activeSkill != null){
+                    // If the last activity is not null then go to that activity but update the placement index by 1
+                    if(activeSkill.equals(SELECT_MATH)) {
+                        rootTutor = _matrix.getRootSkillByContentArea(SELECT_MATH);
+                        CAt_Data transitionData = (CAt_Data) transitionMap.get(activeTutorId);
+                        activeTutorId = transitionData.harder;
+                    }
+                    if(activeSkill.equals(SELECT_WRITING)) {
+                        rootTutor = _matrix.getRootSkillByContentArea(SELECT_WRITING);
+                        CAt_Data transitionData = (CAt_Data) transitionMap.get(activeTutorId);
+                        activeTutorId = transitionData.harder;
+                    }
+                }
+
+                break;
 
             case AS_CONST.SELECT_REPEAT:
 
@@ -168,4 +221,4 @@ public CAt_Data getTutorToLaunch(String buttonBehavior) {
     public String getDebugMenuSkill() {
         return _student.getActiveSkill();
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/ask_activity_selector_2x2_elevate.xml b/app/src/main/res/layout/ask_activity_selector_2x2_elevate.xml
new file mode 100644
index 000000000..82a783520
--- /dev/null
+++ b/app/src/main/res/layout/ask_activity_selector_2x2_elevate.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.percentlayout.widget.PercentRelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
+
+    android:layout_centerInParent="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F3FAFF">
+
+    <cmu.xprize.comp_ask.CImageButton
+        android:id="@+id/SbuttonOption1"
+        android:layout_width="match_parent"
+        android:scaleType="fitCenter"
+        android:padding="40dp"
+        app:layout_heightPercent="50%"
+        app:layout_widthPercent="50%"
+        android:background="@null"
+        android:src="@drawable/pentagon"
+        />
+
+    <cmu.xprize.comp_ask.CImageButton
+        android:id="@+id/SbuttonOption2"
+        android:layout_toRightOf="@id/SbuttonOption1"
+        android:scaleType="fitCenter"
+        android:layout_width="match_parent"
+        android:padding="40dp"
+        app:layout_heightPercent="50%"
+        app:layout_widthPercent="50%"
+        android:background="@null"
+        android:src="@drawable/triangle"/>
+
+
+    <cmu.xprize.comp_ask.CImageButton
+        android:id="@+id/Sbutton1"
+        android:scaleType="fitCenter"
+        android:layout_below="@+id/SbuttonOption1"
+        android:layout_toRightOf="@+id/SbuttonEmpty"
+        android:layout_width="match_parent"
+        android:padding="40dp"
+        app:layout_heightPercent="50%"
+        app:layout_widthPercent="50%"
+        android:background="@null"
+        android:src="@drawable/button_okay_select"        />
+
+    <cmu.xprize.comp_ask.CImageButton
+        android:id="@+id/SbuttonExit"
+        android:layout_toRightOf="@id/Sbutton1"
+        android:layout_below="@+id/SbuttonOption2"
+        android:scaleType="fitCenter"
+        android:layout_width="match_parent"
+        android:padding="40dp"
+        app:layout_heightPercent="50%"
+        app:layout_widthPercent="50%"
+        android:background="@null"
+        android:src="@drawable/button_exit_select"/>
+
+    <cmu.xprize.robotutor.tutorengine.widgets.core.THandAnimation
+        android:id="@+id/ShandAnimator"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipChildren="false"
+        app:scale_factor="0.3"
+        android:background="@null"/>
+
+
+</androidx.percentlayout.widget.PercentRelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/ask_activity_selector_2x3_elevate.xml b/app/src/main/res/layout/ask_activity_selector_2x3_elevate.xml
new file mode 100644
index 000000000..a8dda6d6d
--- /dev/null
+++ b/app/src/main/res/layout/ask_activity_selector_2x3_elevate.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.percentlayout.widget.PercentRelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
+
+    android:layout_centerInParent="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F3FAFF">
+
+    <ImageButton
+        android:id="@+id/SbuttonOption1"
+        android:layout_width="match_parent"
+        android:scaleType="fitCenter"
+        android:padding="40dp"
+        app:layout_heightPercent="50%"
+        app:layout_widthPercent="33%"
+        android:background="@null"
+        android:src="@drawable/button_letters_select"
+        />
+
+    <ImageButton
+        android:id="@+id/SbuttonOption2"
+        android:layout_toRightOf="@id/SbuttonOption1"
+        android:scaleType="fitCenter"
+        android:layout_width="match_parent"
+        android:padding="40dp"
+        app:layout_heightPercent="50%"
+        app:layout_widthPercent="33%"
+        android:background="@null"
+        android:src="@drawable/button_stories_select"/>
+
+    <ImageButton
+        android:id="@+id/SbuttonOption3"
+        android:layout_toRightOf="@id/SbuttonOption2"
+        android:scaleType="fitCenter"
+        android:layout_width="match_parent"
+        android:padding="40dp"
+        app:layout_heightPercent="50%"
+        app:layout_widthPercent="33%"
+        android:background="@null"
+        android:src="@drawable/button_math_select"/>
+
+    <ImageButton
+        android:id="@+id/SbuttonEmpty"
+        android:scaleType="fitCenter"
+        android:layout_below="@+id/SbuttonOption1"
+        android:layout_width="match_parent"
+        android:padding="40dp"
+        app:layout_heightPercent="50%"
+        app:layout_widthPercent="33%"
+        android:background="@null"
+        />
+
+    <ImageButton
+        android:id="@+id/Sbutton1"
+        android:scaleType="fitCenter"
+        android:layout_below="@+id/SbuttonOption2"
+        android:layout_toRightOf="@+id/SbuttonEmpty"
+        android:layout_width="match_parent"
+        android:padding="40dp"
+        app:layout_heightPercent="50%"
+        app:layout_widthPercent="33%"
+        android:background="@null"
+        android:src="@drawable/button_okay_select"
+        />
+
+    <ImageButton
+        android:id="@+id/SbuttonExit"
+        android:layout_toRightOf="@id/SbuttonOption2"
+        android:layout_below="@+id/SbuttonOption3"
+        android:scaleType="fitCenter"
+        android:layout_width="match_parent"
+        android:padding="40dp"
+        app:layout_heightPercent="50%"
+        app:layout_widthPercent="33%"
+        android:background="@null"
+        android:src="@drawable/button_exit_select"/>
+
+    <cmu.xprize.robotutor.tutorengine.widgets.core.THandAnimation
+        android:id="@+id/ShandAnimator"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipChildren="false"
+        app:scale_factor="0.3"
+        android:background="@null"/>
+
+
+</androidx.percentlayout.widget.PercentRelativeLayout>
\ No newline at end of file
diff --git a/comp_session/src/main/java/cmu/xprize/comp_session/AS_CONST.java b/comp_session/src/main/java/cmu/xprize/comp_session/AS_CONST.java
index f01122388..0f0304737 100644
--- a/comp_session/src/main/java/cmu/xprize/comp_session/AS_CONST.java
+++ b/comp_session/src/main/java/cmu/xprize/comp_session/AS_CONST.java
@@ -52,7 +52,7 @@ public static final class BEHAVIOR_KEYS {
     public static final String SELECT_AUTO_DIFFICULTY = "SELECT_AUTO_DIFFICULTY";   // get rid of me
     public static final String SELECT_REPEAT          = "SELECT_REPEAT";
     public static final String SELECT_EXIT            = "SELECT_EXIT";
-
+    public static final String ELEVATE                = "ELEVATE_TO_PLACEMENT";
     public static final String SELECT_NONE            = "SELECT_NONE";
 
     public static final String VAR_BUTTONID         = ".buttonid";
diff --git a/gradle.properties b/gradle.properties
index df730a970..ae6cd3962 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 --add-opens java.base/java.io=ALL-UNNAMED
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 05ef575b0..7454180f2 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 130c81d44..ffed3a254 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat Jan 02 13:34:20 IST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/gradlew b/gradlew
index 9d82f7891..1b6c78733 100755
--- a/gradlew
+++ b/gradlew
@@ -1,74 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -77,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -85,76 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index aec99730b..ac1b06f93 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,20 +24,23 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,34 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell