diff --git a/dashboard-project-api/common/models/userStory.js b/dashboard-project-api/common/models/userStory.js
index 1bf804f..affb5e4 100644
--- a/dashboard-project-api/common/models/userStory.js
+++ b/dashboard-project-api/common/models/userStory.js
@@ -8,77 +8,19 @@ module.exports = function(UserStory) {
   var async = require("async");
   var htmlparser = require("htmlparser");
   var cheerio = require('cheerio');
+  const SPEC_URL = "http://specs.openstack.org/openstack/openstack-user-stories/user-stories/proposed/";
 
 
   var blueprintsResume = [];
 
 
-  var getAllfiles = function(getPercentage){
-
+  var getAllfiles = function(){
     return  fs.readdirSync(route)
       .map(function(file){
         var route = "../tracker/" + file ;
-        var data = JSON.parse(fs.readFileSync(route));
-        var parsedData;
-
-        if(getPercentage){
-            parsedData = getTotalPercentage(data);
-            data.blueprintList = parsedData;
-        }
-
-        return data;
+        var userStory = JSON.parse(fs.readFileSync(route));
+        return userStory;
       });
-
-  }
-
-  //get completed percentage of all the userstories
-  var getTotalPercentage = function(userStory){
-
-    blueprintsResume.completed = 0;
-    blueprintsResume.total = 0;
-    var blueprintList = [];
-
-      userStory.tasks.forEach(function (taskName, index, array) {
-
-        var task = userStory.tasks_status[taskName];
-
-        task.projects.forEach(function (projectName, index, array) {
-
-          var blueprints = task.projects_status[projectName].blueprints;
-          var blueprintNames = Object.keys(blueprints);
-          blueprintList.push(blueprintNames);
-
-          blueprintNames.forEach(function (blueprintName, index, array) {
-
-            if (blueprints[blueprintName] == 'completed')
-              blueprintsResume.completed = blueprintsResume.completed + 1;
-
-            blueprintsResume.total = blueprintsResume.total + 1;
-
-          })
-
-        })
-
-      })
-
-    var finalPercentage = Math.round((blueprintsResume.completed*100)/blueprintsResume.total)
-      blueprintList.push([{percentage:(finalPercentage)}]);
-      return blueprintList;
-
-  }
-
-  //get completed percentage of a User story
-  var getPercentage = function(blueprints){
-    var total = blueprints.length;
-    var complete = 0;
-
-    blueprints.forEach(function(element, index, array) {
-
-      if(element == 'completed')
-        complete = complete + 1;
-    })
-    return Math.round((complete*100)/total);
-
   }
 
   var getFileById = function(id){
@@ -99,163 +41,95 @@ module.exports = function(UserStory) {
 
   };
 
-  var getDetailedUri = function(source) {
-    var base = 'http://specs.openstack.org/openstack/openstack-user-stories/user-stories/proposed/';
+  //get all the completed blueprints
+  var getbluePrintResume = function(userStory){
+    var blueprintsResume = {
+          completed: 0,
+          total: 0
+    }
 
-    return base + source + '.html';
+    userStory.tasks.forEach(function (taskName, index, array) {
 
-  }
+        var task = userStory.tasks_status[taskName];
 
-  var parseUserStory = function(id){
-    var data = [];
-    return function(callback){
-      var file = getFileById(id);
+        task.projects.forEach(function (projectName, index, array) {
 
-      var Patch = app.models.Patch;
+          var blueprints = task.projects_status[projectName].blueprints;
+          var blueprintNames = Object.keys(blueprints);
 
-      Patch.latestUpdate(file.source, function(err, response) {
+          blueprintNames.forEach(function (blueprintName, index, array) {
 
-        var lastUpdate = '';
+            if (blueprints[blueprintName] == 'completed')
+              blueprintsResume.completed = blueprintsResume.completed + 1;
 
-        if(response){
-          response = JSON.parse(response.substring(5));
-          response.forEach( function each (element){
-            data.push(
-              {
-                latestDate: element.updated,
-              });
-          });
+            blueprintsResume.total = blueprintsResume.total + 1;
 
-          data = data.sort();
-          lastUpdate =  data.shift();
+          })
 
-          if(lastUpdate){
-            lastUpdate = lastUpdate.latestDate;
-          }
-        }
-
-        var userStory = {
-          title:file.description,
-          description:'',
-          status:file.status,
-          showDetailedUri:getDetailedUri(file.source),
-          submittedBy:file.submitted_by.name,
-          submittedByEmail:file.submitted_by.email,
-          createdOn:file.date,
-          updatedOn:lastUpdate,
-          id:file.id,
-          percentageComplete:''
-        };
-        callback(null, userStory, file.tasks, file.tasks_status);
+        })
 
       })
 
-    }
+    blueprintsResume.percentage = (blueprintsResume.completed/blueprintsResume.total)*100;
+    
+    return blueprintsResume;
   }
 
+  //get the field lastupdated for a usterStory 
+  var getLastUpdated = function(userStory, cb){
+    var Patch = app.models.Patch;
+    var lastUpdate = '';
 
-  var getTaskDescription = function(task, callback){
+    Patch.latestUpdate(userStory.source, function (err, response, next) {
+      response = JSON.parse(response.substring(5));
 
-    var Rst = app.models.Rst;
-    var spec = task['cross-project spec'] + '.rst'
+      console.log('response', response);
 
-    Rst.list(spec, function(err, data){
+      if(response.length > 0){
+        lastUpdate =  response.map( function each (element){
+                        return element.updated
+                      }).sort().shift();
+        var arrayLastUpdate = lastUpdate.split(' ');
+        lastUpdate = arrayLastUpdate[0];
 
-      var html_content = markdown.toHTML(data);
-      var $ = cheerio.load(html_content);
-
-      var index = null;
-      //Find the title
-      var description = $('h1').each(function(i, elem) {
-        if(elem.children[0].data == 'Problem description'){
-          index = i;
-        }
-      });
-
-      //get Text description
-      if(index != null){
-        description = $($('h1')[index]).next().text()
-      }else{
-        description = '';
       }
 
-      callback(null, description);
+      cb(null, lastUpdate)
 
     })
 
   }
 
-  var getUriTask = function(spec){
-    var base = 'https://github.com/openstack/openstack-specs/blob/master/specs/';
 
-    return base + spec + '.rst';
-  }
+  // Parse data from userStory
+  var parseUserStory = function(userStory, callback){
+    
+      async.waterfall([function(cb){
 
-  var parseTask = function(originalTask, callback){
+        getLastUpdated(userStory, cb)
 
-    getTaskDescription(originalTask, function(err, description){
-      originalTask.description = description;
-      originalTask.url = getUriTask(originalTask['cross-project spec']);
-      originalTask.xp_status = originalTask.xp_status;
-      callback(null, originalTask)
-    })
+      },function(lastUpdated, cb){
+        userStory.updatedOn = lastUpdated;
+        userStory.showDetailedUri = SPEC_URL + userStory.source + '.html';
+        userStory.createdOn = userStory.date;
+        userStory.completed = getbluePrintResume(userStory);
 
-  }
+        cb(null, userStory);
+              
+        },function(userStory, cb){
 
+          var tasksName = userStory.tasks;
+          var tasks = userStory.tasks_status;
 
-  var parseProject = function(originalProject, callback){
-
-    var urlArray = originalProject.spec.split('/');
-    var nameArray = urlArray[urlArray.length-1].split('.')
-    originalProject.spec_name = nameArray[0];
-
-    callback(null, originalProject)
-  }
-
-
-  var parseBlueprint = function(originalBlueprint, blueprintName, projectName, callback){
-    var Blueprint = app.models.Blueprint;
-    var Patch = app.models.Patch;
-
-    var status = originalBlueprint;
-
-    Blueprint.url(projectName, blueprintName, function(err, uri){
-
-      blueprintsResume.push(status)
-
-      blueprintsResume.complete = blueprintsResume.total +1 ;
-
-
-      Patch.list(blueprintName, function(err, response) {
-
-        var data = [];
-
-        response = JSON.parse(response.substring(5));
-
-        response.forEach(function each(element) {
-          data.push(
-            {
-              url: "https://review.openstack.org/#/c/" + element._number,
-              name: element.subject
-            });
-        });
-
-        originalBlueprint = {
-          name: blueprintName.replace(/-/g, " "),
-          uri: uri,
-          status: status,
-          review_link:data
-        }
-        callback(null, originalBlueprint)
+          parseTasks(userStory, tasksName, tasks, cb)
 
+        }],function(err,userStory){
+          callback(null, userStory);
       })
-
-    })
-
   }
 
 
-  //TODO: APPLY async.waterfall
+   //??
   var parseTasks = function(userStory, tasksNames, tasks,  callback) { //get tasks
 
     var tmpTasks = {};
@@ -308,7 +182,7 @@ module.exports = function(UserStory) {
       userStory.tasks = tasksNames;
       userStory.tasks_status = tmpTasks;
 
-      userStory.percentageComplete = getPercentage(blueprintsResume)
+      //userStory.percentageComplete = getPercentage(blueprintsResume)
 
       callback(null, userStory);
 
@@ -316,104 +190,146 @@ module.exports = function(UserStory) {
 
   }
 
+
+//?
+
+  var getTaskDescription = function(task, callback){
+
+    var Rst = app.models.Rst;
+    var spec = task['cross-project spec'] + '.rst'
+
+    Rst.list(spec, function(err, data){
+
+      var html_content = markdown.toHTML(data);
+      var $ = cheerio.load(html_content);
+
+      var index = null;
+      //Find the title
+      var description = $('h1').each(function(i, elem) {
+        if(elem.children[0].data == 'Problem description'){
+          index = i;
+        }
+      });
+
+      //get Text description
+      if(index != null){
+        description = $($('h1')[index]).next().text()
+      }else{
+        description = '';
+      }
+
+      callback(null, description);
+
+    })
+
+  }
+//?
+  var getUriTask = function(spec){
+    var base = 'https://github.com/openstack/openstack-specs/blob/master/specs/';
+
+    return base + spec + '.rst';
+  }
+//?
+  var parseTask = function(originalTask, callback){
+
+    getTaskDescription(originalTask, function(err, description){
+      originalTask.description = description;
+      originalTask.url = getUriTask(originalTask['cross-project spec']);
+      callback(null, originalTask)
+    })
+
+  }
+//?
+
+  var parseProject = function(originalProject, callback){
+
+    var urlArray = originalProject.spec.split('/');
+    var nameArray = urlArray[urlArray.length-1].split('.')
+    originalProject.spec_name = nameArray[0];
+
+    callback(null, originalProject)
+  }
+
+//?
+  var parseBlueprint = function(originalBlueprint, blueprintName, projectName, callback){
+    var Blueprint = app.models.Blueprint;
+    var Patch = app.models.Patch;
+
+    var status = originalBlueprint;
+
+    Blueprint.url(projectName, blueprintName, function(err, uri){
+
+      blueprintsResume.push(status)
+
+      blueprintsResume.complete = blueprintsResume.total +1 ;
+
+
+      Patch.list(blueprintName, function(err, response) {
+
+        var data = [];
+
+        response = JSON.parse(response.substring(5));
+
+        response.forEach(function each(element) {
+          data.push(
+            {
+              url: "https://review.openstack.org/#/c/" + element._number,
+              name: element.subject
+            });
+        });
+
+        originalBlueprint = {
+          name: blueprintName.replace(/-/g, " "),
+          uri: uri,
+          status: status,
+          review_link:data
+        }
+        callback(null, originalBlueprint)
+
+      })
+
+    })
+
+  }
+
+ 
+
   UserStory.on('attached',function(){
 
     UserStory.findById = function(id, params, cb){
 
-      async.waterfall([
-        parseUserStory(id),
-        parseTasks
-      ], function (err, result) {
-        cb(null,result)
-      });
-
-    };
+      var userStory = getFileById(id);
+      parseUserStory(userStory, cb);
+      
+    };//end find by id
 
     UserStory.find = function(params, cb){
-        var Patch = app.models.Patch;
-      //get all files
-        var userStories = getAllfiles(true);
-        var percentage;
-        var blueprintKeys;
-        var dateList = [];
-        //var response = userStories;
+        var userStories = getAllfiles();
 
-        var result;
+        async.mapSeries(userStories, parse, cb);
 
-        // looking dates
-        var lookingDates = function (id, blueprintKeys) {
-            blueprintKeys.forEach(function each (key) {
-                var data = [];
-                Patch.latestUpdate(key, function (err, response, next) {
+        function parse(userStory, callback) {
 
-                    response = JSON.parse(response.substring(5));
-                    async.waterfall([
-                        function createOutput(next){
-                            response.forEach( function each (element){
-                                data.push(
-                                {
-                                    latestDate: element.updated,
-                                });
-                            });
-                            next();
-                        },
-                        function sendData (next) {
-                            data = data.sort();
-                            var lastUpdate =  data.shift();
-                            if(lastUpdate !== undefined) {
-                                dateList.push({
-                                    id: id,
-                                    value: lastUpdate.latestDate
-                                });
-                            }
-                            next;
-                        }
-                    ], next);
-                });
-            });
+          async.waterfall([function(cb){
+            getLastUpdated(userStory, cb)
+          },function(lastUpdated, cb){
+          
+            var itemResult = {
+              completed: getbluePrintResume(userStory),
+              dateCreated: userStory.date,
+              lastUpdate: lastUpdated,
+              userStory: userStory.description,
+              id:userStory.id
+            };
+
+            cb(null, itemResult);
+              
+          }],function(err,result){
+              callback( err, result);
+          })
         }
+    };//End find
 
-        function keysrt(key,asc) {
-            return function(a,b){
-                return asc ? ~~(a[key] < b[key]) : ~~(a[key] > b[key]);
-            }
-        }
-
-        async.waterfall ([
-            function readStories (next) {
-                userStories.forEach (function eachStory (story, x) {
-                    //console.log(story.blueprintList);
-                    //TODO change the array of percentage
-                    percentage = (story.blueprintList).pop();
-                    blueprintKeys = story.blueprintList;
-                    result = lookingDates((story.id), blueprintKeys);
-                    story.percentage = percentage[0].percentage;
-                });
-                next();
-            },
-            function resumeDate (next){
-                setTimeout(function(){
-                    dateList = dateList.sort(keysrt('value'));
-                    userStories.forEach (function eachStory (story) {
-                        dateList.forEach (function eachDate (dateElement){
-                            if(dateElement.id === story.id){
-                                story.latestUpdate = dateList
-                            }
-                        });
-                    });
-                    cb(null,userStories);
-                }, 1000);
-
-                next;
-            },
-            function sendResult(next){
-                //cb(null,userStories);
-                next;
-            }
-        ]);
-
-
-    }
   })
 
 };
diff --git a/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js b/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js
index 48ab848..0d8817d 100755
--- a/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js
+++ b/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js
@@ -2,8 +2,8 @@
 (function(){
 
   angular.module('dashboardProjectApp')
-    .controller('projectDetailController', ['$scope','$state', 'UserStory'/*, 'tasksService', 'tasks', 'task'*/,
-      function($scope, $state, UserStory/*, tasksService, tasks, task*/) {
+    .controller('projectDetailController', ['$scope','$state', 'UserStory',
+      function($scope, $state, UserStory) {
 
         $scope.taskId = $state.params.id;
         $scope.openTasks = {};
diff --git a/dashboard-project-app/client/app/projectDetail/projectDetail.js b/dashboard-project-app/client/app/projectDetail/projectDetail.js
index eb6dfac..1d06e3b 100755
--- a/dashboard-project-app/client/app/projectDetail/projectDetail.js
+++ b/dashboard-project-app/client/app/projectDetail/projectDetail.js
@@ -6,12 +6,6 @@ angular.module('dashboardProjectApp')
     $stateProvider
       .state('projectDetail', {
         url: '/projectDetail/:id',
-       /* resolve: {
-          userStory: ['userStoryService',
-         function(userStoryService) {
-         return userStoryService.getTasks();
-         }]
-         },*/
         templateUrl: 'app/projectDetail/views/projectDetail.html',
         controller: 'projectDetailController'
       })
diff --git a/dashboard-project-app/client/app/projectDetail/views/quickResume.html b/dashboard-project-app/client/app/projectDetail/views/quickResume.html
index 8d288d3..986d0a3 100755
--- a/dashboard-project-app/client/app/projectDetail/views/quickResume.html
+++ b/dashboard-project-app/client/app/projectDetail/views/quickResume.html
@@ -4,7 +4,7 @@
       <div class="row">
         <div class="col-xs-11">
           <div class="dp-title ">
-            {{userStory.title}}
+            {{userStory.description}}
               <span class="dp-label label label-primary dp-label-{{userStory.status}}">
                 {{userStory.status  | removeDashes | capitalize}}
               </span>
@@ -30,8 +30,8 @@
         <div class="col-xs-3">
           <i class="fa fa-user" aria-hidden="true"></i>
           <strong>Submitted by</strong>
-          <a href ng-click="mailTo(userStory.submittedByEmail)">
-            {{userStory.submittedBy}}
+          <a href ng-click="mailTo(userStory.submitted_by.email)">
+            {{userStory.submitted_by.name}}
           </a>
 
         </div>
@@ -48,8 +48,8 @@
         <div class="col-xs-12">
           <div class="progress">
             <div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar"
-                 aria-valuenow="{{userStory.percentageComplete}}" aria-valuemin="0" aria-valuemax="100" style="width: {{userStory.percentageComplete}}%">
-              <span class="sr-only">{{userStory.percentageComplete}}% Complete</span>
+                 aria-valuenow="{{userStory.completed.percentage}}" aria-valuemin="0" aria-valuemax="100" style="width: {{userStory.completed.percentage}}%">
+              <span class="sr-only">{{userStory.completed.completed}} / {{userStory.completed.total}} Blueprints completed</span>
             </div>
           </div>
         </div>
diff --git a/dashboard-project-app/client/app/projectList/controllers/projectList.controller.js b/dashboard-project-app/client/app/projectList/controllers/projectList.controller.js
index 514ea3a..2914c6c 100755
--- a/dashboard-project-app/client/app/projectList/controllers/projectList.controller.js
+++ b/dashboard-project-app/client/app/projectList/controllers/projectList.controller.js
@@ -12,20 +12,26 @@ angular.module('dashboardProjectApp').controller('projectListCtrl', function(
             new Promise(function(resolve, reject) {
                 var stringDate, realDate;
 
+                
                 userStories.forEach(function each (story) {
-                    if(story.latestUpdate !== undefined) {
-                        lastUpdate = moment(story.latestUpdate[0].value).format("MM-DD-YYYY");
+
+                    console.log('userStories', story);
+                    if(story.lastUpdate !== '') {
+                        lastUpdate = moment(story.lastUpdate, "YYYY-MM-DD").format("MM-DD-YYYY");
                     } else {
-                        lastUpdate = moment(story.date, "DD-MM-YYYY").format("MM-DD-YYYY");
+                        lastUpdate = moment(story.dateCreated, "DD-MM-YYYY").format("MM-DD-YYYY");
                     }
                     data.push(
                         {
-                            userStory: story.id+'-'+story.description,
-                            dateCreated: moment(story.date, "DD-MM-YYYY").format("MM-DD-YYYY"),
+                            userStory: story.id+'-'+story.userStory,
+                            dateCreated: moment(story.dateCreated, "DD-MM-YYYY").format("MM-DD-YYYY"),
                             lastUpdate: lastUpdate,
-                            completed: story.percentage
+                            progressPercentage: story.completed.percentage,
+                            progressLabel: story.completed.completed + ' / ' + story.completed.total
                         }
                     )
+
+                    console.log('data', data);
                     resolve(data);
                 });
             })
diff --git a/dashboard-project-app/client/app/projectList/views/projectList.html b/dashboard-project-app/client/app/projectList/views/projectList.html
index 814bca9..0fc1d47 100755
--- a/dashboard-project-app/client/app/projectList/views/projectList.html
+++ b/dashboard-project-app/client/app/projectList/views/projectList.html
@@ -18,7 +18,7 @@
                     <th data-field="userStory" data-sortable="true" data-formatter="nameFormatter">User Story</th>
                     <th data-field="dateCreated" data-sortable="true">Date Created</th>
                     <th data-field="lastUpdate" data-sortable="true">Last Update</th>
-                    <th data-field="completed" data-sortable="true" data-formatter="progressBar">% Completed</th>
+                    <th data-field="progressPercentage" label="progressLabel" data-sortable="true" data-formatter="progressBar"> Blueprints Completed</th>
                 </tr>
                 </thead>
             </table>
diff --git a/dashboard-project-app/client/index.html b/dashboard-project-app/client/index.html
index 7183ec9..704cfda 100755
--- a/dashboard-project-app/client/index.html
+++ b/dashboard-project-app/client/index.html
@@ -65,13 +65,13 @@
     var story = value.split("-");
     return '<a class="dp-link-title" href="projectDetail/'+ story[0] +'">' + story[1] + '</a>';
   }
-  function progressBar(value, row) {
+  function progressBar(percentage, row) {
 
     return '<div class="progress dp-progress">'+
       '<div class="progress-bar progress-bar-success progress-bar-striped"'+
-      'role="progressbar" aria-valuenow="'+value+'" aria-valuemin="0"' +
-      'aria-valuemax="100" style="width: '+value+'%">'+
-      '<span class="sr-only">'+value+'%</span>' +
+      'role="progressbar" aria-valuenow="'+percentage+'" aria-valuemin="0"' +
+      'aria-valuemax="100" style="width: '+percentage+'%">'+
+      '<span class="sr-only">'+row.progressLabel+'</span>' +
       '</div>' +
       '</div>';
   }