Speed improvements. Before adding angular.