Many changes... Using angular.js