refactored with angular.js
server update
server updates