diff --git a/gitadora@asphyxia/data/extrastage.ts b/gitadora@asphyxia/data/extrastage.ts
index baa451d..1255bd4 100644
--- a/gitadora@asphyxia/data/extrastage.ts
+++ b/gitadora@asphyxia/data/extrastage.ts
@@ -8,29 +8,59 @@ interface EncoreStageData {
 
 export function getEncoreStageData(info: EamuseInfo): EncoreStageData {
     const fallback = { level: 10, musics: [0] }
+    const level: number = U.GetConfig("encore_version")
     switch (getVersion(info)) {
         case 'nextage':
             return {
-                level: 12  ,
-                musics: [ //TODO: check special encore works.
-                    2587, 2531, 2612, 2622, 2686,
-                    305, 602, 703, 802, 902, 1003, 1201, 1400, 1712, 1916, 2289, 2631, // DD13
-                    1704, 1811, 2121, 2201, 2624, // Soranaki 
-                    1907, 2020, 2282, 2341, 2666  // Stargazer
+                level,
+                musics: [ 
+                    2587, // 悪魔のハニープリン
+                    2531, // The ULTIMATES -reminiscence-
+                    2612, // ECLIPSE 2
+                    2622, // Slip Into My Royal Blood
+                    2686, // CYCLONICxSTORM
+                    // FIXME: Fix special encore.
+                    305, 602, 703, 802, 902, 1003, 1201, 1400, 1712, 1916, 2289, 2631, // DD13 and encores.
+                    1704, 1811, 2121, 2201, 2624, // Soranaki and encores.
+                    1907, 2020, 2282, 2341, 2666  // Stargazer and encores.
                 ]
             }
         case 'exchain':
             return {
-                level: 13,
+                level,
                 musics: [
-                    2498, 2513, 2500, 2529, 2546, 2549, 2548, 2560, 2568, 2576, 5020, 5032, 5031, 5033
+                    2246, // 箱庭の世界
+                    2498, // Cinnamon
+                    2500, // キヤロラ衛星の軌跡
+                    2529, // グリーンリーフ症候群
+                    2548, // Let's Dance                   
+                    2587, // 悪魔のハニープリン  
+                    5020, // Timepiece phase II (CLASSIC)                                        
+                    5033, // MODEL FT2 Miracle Version (CLASSIC)                                       
+                    2586, // 美麗的夏日風                    
+                    5060, // EXCELSIOR DIVE (CLASSIC)
+                    2530, // The ULTIMATES -CHRONICLE-
+                    2581, // 幸せの代償
+                    5046  // Rock to Infinity (CLASSIC)    
                 ]
             }
         case 'matixx':
             return {
-                level:13,
+                level,
                 musics: [
-                    2432, 2445, 2456, 2441, 2444, 2381, 2471, 2476, 2486, 2496, 2497, 2499, 2498
+                    2432, // Durian
+                    2445, // ヤオヨロズランズ
+                    2456, // Fate of the Furious
+                    2441, // PIRATES BANQUET
+                    2444, // Aion
+                    2381, // Duella Lyrica
+                    2471, // triangulum
+                    2476, // MODEL FT4 
+                    2486, // 煉獄事変
+                    2496, // CAPTURING XANADU
+                    2497, // Physical Decay
+                    2499, // Cinnamon 
+                    2498 // けもののおうじゃ★めうめう
                 ]
             }
         default:
diff --git a/gitadora@asphyxia/handlers/profiles.ts b/gitadora@asphyxia/handlers/profiles.ts
index 67eb52f..14541f7 100644
--- a/gitadora@asphyxia/handlers/profiles.ts
+++ b/gitadora@asphyxia/handlers/profiles.ts
@@ -390,7 +390,7 @@ export const getPlayer: EPR = async (info, data, send) => {
   send.object({
     player: K.ATTR({ 'no': `${no}` }, {
       now_date: K.ITEM('u64', time),
-      secretmusic: { // TODO: FIX THIS FOR STOP INFOS ON GAME END
+      secretmusic: { // TODO: FIX THIS
         music: _.merge(_.range(0,2800), _.range(5000, 5100)).map(mid => {
           return {
             musicid: K.ITEM('s32', mid),
@@ -399,7 +399,7 @@ export const getPlayer: EPR = async (info, data, send) => {
           }
         }),
       },
-      trbitem: {
+      trbitem: { // TODO: FIX THIS
         item: _.range(0,750).map(id => {
           return {
             itemid: K.ITEM('s32', id),
diff --git a/gitadora@asphyxia/index.ts b/gitadora@asphyxia/index.ts
index 3fcf7a1..1619552 100644
--- a/gitadora@asphyxia/index.ts
+++ b/gitadora@asphyxia/index.ts
@@ -14,6 +14,13 @@ export function register() {
 
   R.GameCode('M32');
 
+  R.Config("encore_version", {
+    name: "Encore Version",
+    desc: "Set encore version",
+    type: "integer",
+    default: 13,
+  })
+
   R.Config("enable_custom_mdb", {
     name: "Enable Custom MDB",
     desc: "For who uses own MDB",