diff --git a/index.js b/index.js
index f05f4c5..5a7b1d1 100644
--- a/index.js
+++ b/index.js
@@ -5,22 +5,24 @@ var config = iniparser.parseSync('./config.ini');
 var aaaHost = config.globals.aaa_host;
 
 var logger = require('sate24/logger.js').start();
-
-HttpServer = require('sate24/httpserver.js');
-var httpServer = HttpServer.start(config, {logger: logger});
-
+var HttpServer = require('sate24/httpserver.js');
 var aaa = require('sate24/aaa.js');
-HttpServer.setAaa(aaa);
-
 var partner = require('./gentong.js');
 
+var matrix = aaa.prepareMatrix();
+
 var options = {
     'aaa': aaa,
     'logger': logger,
     'config': config,
+    'matrix': matrix,
     'expresso_views': 'node_modules/sate24-expresso/views'
 }
 
+//var httpServer = HttpServer.start(config, {logger: logger});
+var httpServer = HttpServer.start(config, options);
+//HttpServer.setAaa(aaa);
+
 partner.start(config, aaa.callbackReport, options);
-aaa.start(config, partner, {logger: logger});
+aaa.start(config, partner, options);
 expresso.start(options);