diff --git a/source/W3MayaAnimUtil.cpp b/source/W3MayaAnimUtil.cpp
index 53cf125..fe672da 100644
--- a/source/W3MayaAnimUtil.cpp
+++ b/source/W3MayaAnimUtil.cpp
@@ -243,7 +243,12 @@ void W3MayaAnimUtil::applyEdits() {
         hasChanges = true;
     }
     if (ui->checkEditAddRootMotion->isChecked()) {
-
+        QJsonObject animBuff = animObj.value("animBuffer").toObject();
+        QJsonArray animBones = animBuff.value("bones").toArray();
+        editAddEmptyBoneFrames(animBones, "RootMotion");
+        animBuff["bones"] = animBones;
+        animObj["animBuffer"] = animBuff;
+        hasChanges = true;
     }
     if (ui->groupEditBake->isChecked()) {
         editBakeBones(animObj, ui->checkEditBakePos->isChecked(), ui->checkEditBakeRot->isChecked(), ui->checkEditBakeScale->isChecked());
@@ -258,6 +263,11 @@ void W3MayaAnimUtil::applyEdits() {
         hasChanges = true;
     }
 
+    if (ui->groupEditOptimize->isChecked()) {
+        int boneOptimized = editOptimizeBones(animObj, ui->checkEditOptimizePos->isChecked(), ui->checkEditOptimizeRot->isChecked(), ui->checkEditOptimizeScale->isChecked());
+        hasChanges = hasChanges || (boneOptimized > 0);
+    }
+
     if (ui->checkEditSortEvents->isChecked()) {
         editSortEvents(eventsArray);
         hasChanges = true;
@@ -397,7 +407,7 @@ void W3MayaAnimUtil::editCropAnim(QJsonObject& animObj, QJsonArray& eventsArray,
            .arg( framesToSec(durationFrames - 1) ));
 }
 
-void W3MayaAnimUtil::editAddEmptyBone(QJsonArray& bonesArr, QString boneName) {
+void W3MayaAnimUtil::editAddEmptyBoneFrames(QJsonArray& bonesArr, QString boneName, int numFrames) {
     int last_index = 0;
     if (!bonesArr.isEmpty()) {
         last_index = bonesArr.last().toObject().value("index").toInt();
@@ -411,14 +421,16 @@ void W3MayaAnimUtil::editAddEmptyBone(QJsonArray& bonesArr, QString boneName) {
     double dt = 0.033333333;
     QString attrNames[3] = { "position", "rotation", "scale" };
     upn(j, 0, 2) {
-        newBoneObj.insert(QString("%1_numFrames").arg(attrNames[j]), 1);
+        newBoneObj.insert(QString("%1_numFrames").arg(attrNames[j]), numFrames);
         QJsonArray attrArray = QJsonArray();
-        if (attrNames[j] == "rotation")
-            attrArray.append(objXYZW(0,0,0,1));
-        else if (attrNames[j] == "position")
-            attrArray.append(objXYZ(0,0,0));
-        else
-            attrArray.append(objXYZ(1,1,1));
+        upn(jj, 1, numFrames) {
+            if (attrNames[j] == "rotation")
+                attrArray.append(objXYZW(0,0,0,1));
+            else if (attrNames[j] == "position")
+                attrArray.append(objXYZ(0,0,0));
+            else
+                attrArray.append(objXYZ(1,1,1));
+        }
         newBoneObj.insert(QString("%1Frames").arg(attrNames[j]), attrArray);
         newBoneObj.insert(QString("%1_dt").arg(attrNames[j]), dt);
     }
@@ -471,6 +483,94 @@ void W3MayaAnimUtil::editBakeBones(QJsonObject& animObj, bool bakePos, bool bake
     animBuff["bones"] = animBones;
     animObj["animBuffer"] = animBuff;
 }
+
+bool W3MayaAnimUtil::editOptimizeBone(QJsonObject& boneObj, bool optimizePos, bool optimizeRot, bool optimizeScale) {
+    int posNum = boneObj["position_numFrames"].toInt();
+    int rotNum = boneObj["rotation_numFrames"].toInt();
+    int scaleNum = boneObj["scale_numFrames"].toInt();
+
+    optimizePos = posNum > 1;
+    optimizeRot = rotNum > 1;
+    optimizeScale = scaleNum > 1;
+    QJsonArray posArray = boneObj["positionFrames"].toArray();
+    QJsonArray rotArray = boneObj["rotationFrames"].toArray();
+    QJsonArray scaleArray = boneObj["scaleFrames"].toArray();
+
+    upn(frame, 1, posNum - 1) {
+        double diffX = posArray[frame].toObject().value("x").toDouble() - posArray[frame - 1].toObject().value("x").toDouble();
+        double diffY = posArray[frame].toObject().value("y").toDouble() - posArray[frame - 1].toObject().value("y").toDouble();
+        double diffZ = posArray[frame].toObject().value("z").toDouble() - posArray[frame - 1].toObject().value("z").toDouble();
+        double diffTotal = qAbs(diffX) + qAbs(diffY) + qAbs(diffZ);
+        if (diffTotal > mReductionSensitivity()) {
+            optimizePos = false;
+            break;
+        }
+    }
+    upn(frame, 1, rotNum - 1) {
+        double diffX = rotArray[frame].toObject().value("X").toDouble() - rotArray[frame - 1].toObject().value("X").toDouble();
+        double diffY = rotArray[frame].toObject().value("Y").toDouble() - rotArray[frame - 1].toObject().value("Y").toDouble();
+        double diffZ = rotArray[frame].toObject().value("Z").toDouble() - rotArray[frame - 1].toObject().value("Z").toDouble();
+        double diffW = rotArray[frame].toObject().value("W").toDouble() - rotArray[frame - 1].toObject().value("W").toDouble();
+        double diffTotal = qAbs(diffX) + qAbs(diffY) + qAbs(diffZ) + qAbs(diffW);
+        if (diffTotal > mReductionSensitivity()) {
+            optimizeRot = false;
+            break;
+        }
+    }
+    upn(frame, 1, scaleNum - 1) {
+        double diffX = scaleArray[frame].toObject().value("x").toDouble() - scaleArray[frame - 1].toObject().value("x").toDouble();
+        double diffY = scaleArray[frame].toObject().value("y").toDouble() - scaleArray[frame - 1].toObject().value("y").toDouble();
+        double diffZ = scaleArray[frame].toObject().value("z").toDouble() - scaleArray[frame - 1].toObject().value("z").toDouble();
+        double diffTotal = qAbs(diffX) + qAbs(diffY) + qAbs(diffZ);
+        if (diffTotal > mReductionSensitivity()) {
+            optimizeScale = false;
+            break;
+        }
+    }
+    if (optimizePos) {
+        QJsonArray newPosArray;
+        newPosArray.append( posArray.first() );
+        boneObj["positionFrames"] = newPosArray;
+        boneObj["position_numFrames"] = 1;
+    }
+    if (optimizeRot) {
+        QJsonArray newRotArray;
+        newRotArray.append( rotArray.first() );
+        boneObj["rotationFrames"] = newRotArray;
+        boneObj["rotation_numFrames"] = 1;
+    }
+    if (optimizeScale) {
+        QJsonArray newScaleArray;
+        newScaleArray.append( scaleArray.first() );
+        boneObj["scaleFrames"] = newScaleArray;
+        boneObj["scale_numFrames"] = 1;
+    }
+    return (optimizePos || optimizeRot || optimizeScale);
+}
+
+int W3MayaAnimUtil::editOptimizeBones(QJsonObject& animObj, bool optimizePos, bool optimizeRot, bool optimizeScale) {
+    QJsonObject bufferObj = animObj["animBuffer"].toObject();
+    QJsonArray bonesArray = bufferObj["bones"].toArray();
+    int optimized = 0;
+    int numBones = bonesArray.count();
+
+    upn(i, 0, numBones - 1) {
+        QJsonObject boneObj = bonesArray.at(i).toObject();
+        bool boneOptimized = editOptimizeBone(boneObj, optimizePos, optimizeRot, optimizeScale);
+        if (boneOptimized) {
+            optimized += 1;
+            bonesArray[i] = boneObj;
+        }
+    }
+
+    if (optimized > 0) {
+        bufferObj["bones"] = bonesArray;
+        animObj["animBuffer"] = bufferObj;
+    }
+    addLog(QString("\t[EDIT] Optimized %1 bones of %2.").arg(optimized).arg(numBones));
+    return optimized;
+}
+
 void W3MayaAnimUtil::onChecked_EditCut(bool checked) {
     if (checked) {
         if (!ui->groupEditBake->isChecked())
@@ -483,6 +583,13 @@ void W3MayaAnimUtil::onChecked_EditCut(bool checked) {
         ui->groupEditBake->setEnabled(true);
     }
 }
+void W3MayaAnimUtil::onClicked_EditGroupOptimize(bool checked) {
+    if (checked) {
+        ui->checkEditOptimizePos->setChecked(true);
+        ui->checkEditOptimizeRot->setChecked(true);
+        ui->checkEditOptimizeScale->setChecked(true);
+    }
+}
 void W3MayaAnimUtil::onClicked_EditApply() {
     applyEdits();
 }
@@ -1320,6 +1427,11 @@ bool W3MayaAnimUtil::extractMotionFromBone(QJsonValueRef ref) {
     m_animNames.push_back(animName);
     m_animDurations.push_back(animDuration);
 
+    int bonesOptimized = 0;
+    if ( ui->checkOptimizeEqual->isChecked() ) {
+        bonesOptimized = editOptimizeBones(animObj, true, true, true);
+    }
+
     QJsonObject bufferObj = animObj["animBuffer"].toObject();
     QJsonArray bonesArray = bufferObj["bones"].toArray();
     if ( bonesArray.isEmpty() ) {
@@ -1330,133 +1442,66 @@ bool W3MayaAnimUtil::extractMotionFromBone(QJsonValueRef ref) {
     int animFrames = bufferObj["numFrames"].toInt();
     int mBoneIdx = -1;
     QStringList brokenBones;
-    int bonesOptimized = 0;
-    int bonesBaked = 0;
+
 
     upn(i, 0, bonesArray.size() - 1) {
-        QJsonObject tempObj = bonesArray[i].toObject();
-        QString boneName = tempObj.value("BoneName").toString();
+        QJsonObject boneObj = bonesArray[i].toObject();
+        QString boneName = boneObj.value("BoneName").toString();
 
         if (boneName == mBoneName) {
             mBoneIdx = i;
         }
-        int posNum = tempObj["position_numFrames"].toInt();
-        int rotNum = tempObj["rotation_numFrames"].toInt();
-        int scaleNum = tempObj["scale_numFrames"].toInt();
-
-        if ( ui->checkOptimizeEqual->isChecked() ) {
-            bool optimizeTranslation = posNum > 1;
-            bool optimizeRotation = rotNum > 1;
-            bool optimizeScale = scaleNum > 1;
-            QJsonArray posArray = tempObj["positionFrames"].toArray();
-            QJsonArray rotArray = tempObj["rotationFrames"].toArray();
-            QJsonArray scaleArray = tempObj["scaleFrames"].toArray();
-
-            upn(frame, 1, posNum - 1) {
-                double diffX = posArray[frame].toObject().value("x").toDouble() - posArray[frame - 1].toObject().value("x").toDouble();
-                double diffY = posArray[frame].toObject().value("y").toDouble() - posArray[frame - 1].toObject().value("y").toDouble();
-                double diffZ = posArray[frame].toObject().value("z").toDouble() - posArray[frame - 1].toObject().value("z").toDouble();
-                double diffTotal = qAbs(diffX) + qAbs(diffY) + qAbs(diffZ);
-                if (diffTotal > mReductionSensitivity()) {
-                    optimizeTranslation = false;
-                    break;
-                }
-            }
-            upn(frame, 1, rotNum - 1) {
-                double diffX = rotArray[frame].toObject().value("X").toDouble() - rotArray[frame - 1].toObject().value("X").toDouble();
-                double diffY = rotArray[frame].toObject().value("Y").toDouble() - rotArray[frame - 1].toObject().value("Y").toDouble();
-                double diffZ = rotArray[frame].toObject().value("Z").toDouble() - rotArray[frame - 1].toObject().value("Z").toDouble();
-                double diffW = rotArray[frame].toObject().value("W").toDouble() - rotArray[frame - 1].toObject().value("W").toDouble();
-                double diffTotal = qAbs(diffX) + qAbs(diffY) + qAbs(diffZ) + qAbs(diffW);
-                if (diffTotal > mReductionSensitivity()) {
-                    optimizeRotation = false;
-                    break;
-                }
-            }
-            upn(frame, 1, scaleNum - 1) {
-                double diffX = scaleArray[frame].toObject().value("x").toDouble() - scaleArray[frame - 1].toObject().value("x").toDouble();
-                double diffY = scaleArray[frame].toObject().value("y").toDouble() - scaleArray[frame - 1].toObject().value("y").toDouble();
-                double diffZ = scaleArray[frame].toObject().value("z").toDouble() - scaleArray[frame - 1].toObject().value("z").toDouble();
-                double diffTotal = qAbs(diffX) + qAbs(diffY) + qAbs(diffZ);
-                if (diffTotal > mReductionSensitivity()) {
-                    optimizeScale = false;
-                    break;
-                }
-            }
-            if (optimizeTranslation) {
-                QJsonArray nposArray;
-                nposArray.append( posArray.first() );
-                tempObj["positionFrames"] = nposArray;
-                tempObj["position_numFrames"] = 1;
-                posNum = 1;
-            }
-            if (optimizeRotation) {
-                QJsonArray nrotArray;
-                nrotArray.append( rotArray.first() );
-                tempObj["rotationFrames"] = nrotArray;
-                tempObj["rotation_numFrames"] = 1;
-                rotNum = 1;
-            }
-            if (optimizeScale) {
-                QJsonArray nscaleArray;
-                nscaleArray.append( scaleArray.first() );
-                tempObj["scaleFrames"] = nscaleArray;
-                tempObj["scale_numFrames"] = 1;
-                scaleNum = 1;
-            }
-            if (optimizeTranslation || optimizeRotation || optimizeScale) {
-                bonesArray[i] = tempObj;
-                bonesOptimized += 1;
-            }
-        }
+        /*int posNum = boneObj["position_numFrames"].toInt();
+        int rotNum = boneObj["rotation_numFrames"].toInt();
+        int scaleNum = boneObj["scale_numFrames"].toInt();
 
         QString error;
         if (posNum != animFrames && posNum != 1) {
             if (ui->checkAutoBakeIncomplete->isChecked()) {
-                QJsonArray posArray = tempObj["positionFrames"].toArray();
+                QJsonArray posArray = boneObj["positionFrames"].toArray();
                 while (posArray.count() != animFrames) {
                     posArray.append( posArray.last() );
                 }
-                tempObj["positionFrames"] = posArray;
-                tempObj["position_numFrames"] = animFrames;
+                boneObj["positionFrames"] = posArray;
+                boneObj["position_numFrames"] = animFrames;
             }
             error += QString(" [translation = %1];").arg(posNum);
         }
 
         if (rotNum != animFrames && rotNum != 1) {
             if (ui->checkAutoBakeIncomplete->isChecked()) {
-                QJsonArray rotArray = tempObj["rotationFrames"].toArray();
+                QJsonArray rotArray = boneObj["rotationFrames"].toArray();
                 while (rotArray.count() != animFrames) {
                     rotArray.append( rotArray.last() );
                 }
-                tempObj["rotationFrames"] = rotArray;
-                tempObj["rotation_numFrames"] = animFrames;
+                boneObj["rotationFrames"] = rotArray;
+                boneObj["rotation_numFrames"] = animFrames;
             }
             error += QString(" [rotation = %1];").arg(rotNum);
         }
 
         if (scaleNum != animFrames && scaleNum != 1) {
             if (ui->checkAutoBakeIncomplete->isChecked()) {
-                QJsonArray scaleArray = tempObj["scaleFrames"].toArray();
+                QJsonArray scaleArray = boneObj["scaleFrames"].toArray();
                 while (scaleArray.count() != animFrames) {
                     scaleArray.append( scaleArray.last() );
                 }
-                tempObj["scaleFrames"] = scaleArray;
-                tempObj["scale_numFrames"] = animFrames;
+                boneObj["scaleFrames"] = scaleArray;
+                boneObj["scale_numFrames"] = animFrames;
             }
             error += QString(" [scale = %1];").arg(scaleNum);
         }
 
         if (!error.isEmpty()) {
             if (ui->checkAutoBakeIncomplete->isChecked()) {
-                bonesArray[i] = tempObj;
+                bonesArray[i] = boneObj;
                 ++bonesBaked;
             }
             if (boneName.endsWith("_roll") || boneName.startsWith("IK_"))
                 brokenBones.append( boneName + ":" + error );
             else
                 brokenBones.append( "!!! " + boneName + ":" + error );
-        }
+        }*/
     }
 
     bool isAdditive = isAdditiveAnim(animObj);
@@ -1515,7 +1560,7 @@ bool W3MayaAnimUtil::extractMotionFromBone(QJsonValueRef ref) {
             QMessageBox::information(this, "Warning!", QString("Detected bones with incorrect numFrames in anim [%1] (numFrames = %2)\nIt may break the game!\nBones: %3").arg(animName).arg(animFrames).arg(brokenBones.join("\n")));
     }
     if (mBoneIdx == -1) {
-        if (bonesOptimized || bonesBaked) {
+        if (bonesOptimized) {
             bufferObj["bones"] = bonesArray;
             animObj["animBuffer"] = bufferObj;
         }
@@ -2521,11 +2566,11 @@ void W3MayaAnimUtil::onClicked_MergeProcess() {
         boneByNameF[boneNameF] = animBonesF[i].toObject();
     }
     if (!boneByNameF.contains("RootMotion")) {
-        editAddEmptyBone(animBonesF, "RootMotion");
+        editAddEmptyBoneFrames(animBonesF, "RootMotion", framesF);
         boneByNameF["RootMotion"] = animBonesF.last().toObject();
     }
     if (!boneByNameS.contains("RootMotion")) {
-        editAddEmptyBone(animBonesS, "RootMotion");
+        editAddEmptyBoneFrames(animBonesS, "RootMotion", framesS);
         boneByNameS["RootMotion"] = animBonesS.last().toObject();
     }
 
@@ -2540,8 +2585,6 @@ void W3MayaAnimUtil::onClicked_MergeProcess() {
     // for every bone
     for (int j = 0; j < animBonesF.count(); j += 1) {
         QString boneNameF = animBonesF[j].toObject().value("BoneName").toString();
-        if ( !isBlend && boneNameF == "RootMotion" )
-            continue;
 
         QJsonObject boneF = animBonesF[j].toObject();
         QJsonObject boneS = boneByNameS[boneNameF];
@@ -2651,7 +2694,7 @@ void W3MayaAnimUtil::onClicked_MergeProcess() {
                 rotArrF[frame - 1] = objXYZW(sumQ.x(), sumQ.y(), sumQ.z(), sumQ.scalar());
             }
             if (ui->checkMergeCropToSecond->isChecked()) {
-                addLog(QString("\t[MERGE] Cropping anim from %1 to %2 frames.").arg(posArrF.count()).arg(framesS));
+                addLog(QString("\t[MERGE] Cropping bone %1 from %2 to %3 frames.").arg(boneNameF).arg(posArrF.count()).arg(framesS));
                 while (posArrF.count() > framesS) {
                     posArrF.pop_back();
                 }
@@ -2751,6 +2794,11 @@ void W3MayaAnimUtil::onClicked_MergeProcess() {
     animObjF["duration"] = framesToSec(framesTotal - 1);
     animObjF["animBuffer"] = animBuffF;
 
+    /* optimize */
+    if (ui->checkMergeOptimize->isChecked()) {
+        editOptimizeBones(animObjF, true, true, true);
+    }
+
     QJsonObject mergedJsonRoot = QJsonObject();
     mergedJsonRoot.insert("animation", animObjF);
     mergedJsonRoot.insert("entries", eventsArrayF);
diff --git a/source/W3MayaAnimUtil.h b/source/W3MayaAnimUtil.h
index 90569ec..1a19c82 100644
--- a/source/W3MayaAnimUtil.h
+++ b/source/W3MayaAnimUtil.h
@@ -89,7 +89,9 @@ class W3MayaAnimUtil : public QMainWindow
     void editSetCDPRDuration(QJsonObject& animObj);
     void editSortEvents(QJsonArray& eventsArray);
     void editRenameAnim(QJsonObject& animObj, QJsonArray& eventsArray, QString newName);
-    void editAddEmptyBone(QJsonArray& bonesArr, QString boneName);
+    void editAddEmptyBoneFrames(QJsonArray& bonesArr, QString boneName, int numFrames = 1);
+    bool editOptimizeBone(QJsonObject& boneObj, bool optimizePos = true, bool optimizeRot = true, bool optimizeScale = true);
+    int editOptimizeBones(QJsonObject& animObj, bool optimizePos = true, bool optimizeRot = true, bool optimizeScale = true);
     int m_animIndex;
     void applyEdits();
 
@@ -156,6 +158,7 @@ private slots:
     void onChanged_EditEnd(int endFrame);
     void onClicked_EditApply();
     void onClicked_EditApplyAll();
+    void onClicked_EditGroupOptimize(bool checked);
 
     /* MERGE */
     void onClicked_LoadMergeJson();
diff --git a/source/W3MayaAnimUtil.ui b/source/W3MayaAnimUtil.ui
index ac74dcc..c9d9704 100644
--- a/source/W3MayaAnimUtil.ui
+++ b/source/W3MayaAnimUtil.ui
@@ -147,15 +147,15 @@
     <item>
      <widget class="QToolBox" name="toolBox">
       <property name="currentIndex">
-       <number>0</number>
+       <number>3</number>
       </property>
       <widget class="QWidget" name="page_0_Edit">
        <property name="geometry">
         <rect>
          <x>0</x>
-         <y>0</y>
+         <y>-79</y>
          <width>934</width>
-         <height>421</height>
+         <height>487</height>
         </rect>
        </property>
        <attribute name="label">
@@ -180,7 +180,7 @@
            <property name="spacing">
             <number>8</number>
            </property>
-           <item row="9" column="2">
+           <item row="10" column="2">
             <widget class="QPushButton" name="buttonEditApply">
              <property name="enabled">
               <bool>false</bool>
@@ -190,7 +190,7 @@
              </property>
             </widget>
            </item>
-           <item row="6" column="0">
+           <item row="7" column="0">
             <widget class="QCheckBox" name="editForceDuration">
              <property name="text">
               <string>Force set duration from numFrames</string>
@@ -233,7 +233,7 @@
               <item>
                <widget class="QCheckBox" name="checkEditBakePos">
                 <property name="text">
-                 <string>Bake Pos</string>
+                 <string>Bake Position</string>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
@@ -246,7 +246,7 @@
               <item>
                <widget class="QCheckBox" name="checkEditBakeRot">
                 <property name="text">
-                 <string>Bake Rot</string>
+                 <string>Bake Rotation</string>
                 </property>
                 <property name="checked">
                  <bool>false</bool>
@@ -266,7 +266,7 @@
              </layout>
             </widget>
            </item>
-           <item row="9" column="0">
+           <item row="10" column="0">
             <widget class="QPushButton" name="buttonEditApplyAll">
              <property name="enabled">
               <bool>false</bool>
@@ -376,7 +376,7 @@
              </layout>
             </widget>
            </item>
-           <item row="5" column="0">
+           <item row="6" column="0">
             <widget class="QCheckBox" name="checkEditSortEvents">
              <property name="text">
               <string>Sort anim events by startTime</string>
@@ -386,7 +386,14 @@
              </property>
             </widget>
            </item>
-           <item row="9" column="1">
+           <item row="1" column="0">
+            <widget class="QCheckBox" name="checkEditAddRootMotion">
+             <property name="text">
+              <string>Add RootMotion bone (with no motion on it)</string>
+             </property>
+            </widget>
+           </item>
+           <item row="10" column="1">
             <widget class="QLabel" name="label_3">
              <property name="text">
               <string/>
@@ -413,11 +420,61 @@
              </property>
             </widget>
            </item>
-           <item row="1" column="0">
-            <widget class="QCheckBox" name="checkEditAddRootMotion">
-             <property name="text">
-              <string>Add RootMotion bone (with no motion on it)</string>
+           <item row="5" column="0" colspan="3">
+            <widget class="QGroupBox" name="groupEditOptimize">
+             <property name="title">
+              <string>Optimize resulting bone frames: set single frame where all keys are equal (recommended to speed up loading in Maya)</string>
+             </property>
+             <property name="checkable">
+              <bool>true</bool>
              </property>
+             <layout class="QHBoxLayout" name="horizontalLayout_10">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="leftMargin">
+               <number>12</number>
+              </property>
+              <property name="topMargin">
+               <number>6</number>
+              </property>
+              <property name="rightMargin">
+               <number>6</number>
+              </property>
+              <property name="bottomMargin">
+               <number>6</number>
+              </property>
+              <item>
+               <widget class="QCheckBox" name="checkEditOptimizePos">
+                <property name="text">
+                 <string>Optimize Position</string>
+                </property>
+                <property name="checked">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="checkEditOptimizeRot">
+                <property name="text">
+                 <string>Optimize Rotation</string>
+                </property>
+                <property name="checked">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="checkEditOptimizeScale">
+                <property name="text">
+                 <string>Optimize Scale</string>
+                </property>
+                <property name="checked">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
             </widget>
            </item>
           </layout>
@@ -832,11 +889,14 @@
               </item>
               <item>
                <widget class="QCheckBox" name="checkAutoBakeIncomplete">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
                 <property name="text">
                  <string>anims: Bake to full frameset if bone is incomplete (using last frame)</string>
                 </property>
                 <property name="checked">
-                 <bool>true</bool>
+                 <bool>false</bool>
                 </property>
                </widget>
               </item>
@@ -970,7 +1030,7 @@ color: rgb(255, 255, 255);</string>
            <item row="1" column="0">
             <widget class="QCheckBox" name="checkMergeRemoveOrigin">
              <property name="enabled">
-              <bool>true</bool>
+              <bool>false</bool>
              </property>
              <property name="text">
               <string>dev: remove origin from 2nd</string>
@@ -1074,6 +1134,9 @@ color: rgb(255, 255, 255);</string>
            </item>
            <item row="3" column="0">
             <widget class="QCheckBox" name="checkMergeSumInversePos">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
              <property name="text">
               <string>dev: sum: inverse sign (POS)</string>
              </property>
@@ -1098,11 +1161,24 @@ color: rgb(255, 255, 255);</string>
            </item>
            <item row="5" column="0">
             <widget class="QCheckBox" name="checkMergeSumInverseRot">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
              <property name="text">
               <string>dev: sum: inverse sign (ROT)</string>
              </property>
             </widget>
            </item>
+           <item row="9" column="0" colspan="4">
+            <widget class="QCheckBox" name="checkMergeOptimize">
+             <property name="text">
+              <string>Optimize resulting bone frames: set single frame where all keys are equal (recommended to speed up loading in Maya)</string>
+             </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
diff --git a/source/res.qrc b/source/res.qrc
index 1b4bab1..e9d95a2 100644
--- a/source/res.qrc
+++ b/source/res.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>icon.ico</file>
-        <file>Distract_scheme.jpg</file>
         <file>Merge_scheme.jpg</file>
     </qresource>
 </RCC>