diff --git a/index.js b/index.js
index 0a248c8..b6ab0f0 100644
--- a/index.js
+++ b/index.js
@@ -1,12 +1,17 @@
 var express = require('express')
   , request = require('request')
   , cors = require('cors')
-  , FirebaseTokenGenerator = require("firebase-token-generator")
+  , firebase = require("firebase")
   , app = express();
 
 module.exports = function(config) {
-  var tokenGenerator = new FirebaseTokenGenerator(config.firebase_secrect);
-   
+
+  firebase.initializeApp({
+    //create a private key with https://firebase.google.com/docs/server/setup
+    serviceAccount: "serviceAccountCredentials.json",
+    databaseURL: ""
+  });
+
   app.use(cors());
    
   app.get('/', function(req, res, next){
@@ -25,8 +30,8 @@ module.exports = function(config) {
             given_name: tokenInfo.given_name,
             family_name: tokenInfo.family_name
           };
-          var firebaseToken = tokenGenerator.createToken(firebaseTokenInfo);
-          res.json({valid: true, token: firebaseToken});
+          var firebaseToken = firebase.auth().createCustomToken(firebaseTokenInfo.uid, firebaseTokenInfo);
+          res.json({valid: true, token: firebaseToken, user: firebaseTokenInfo});
         } else {
           res.json({valid: false});
         }
@@ -37,4 +42,4 @@ module.exports = function(config) {
   });
 
   return app;
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 51226c6..4cba7a1 100644
--- a/package.json
+++ b/package.json
@@ -14,11 +14,12 @@
   "dependencies": {
     "cors": "^2.7.1",
     "express": "^4.13.3",
-    "firebase-token-generator": "^2.0.0",
+    "firebase": "^3.2.1",
     "request": "^2.65.0"
   },
   "main": "index",
   "engines": {
     "node": ">= 0.4.1"
   }
+
 }