some modifications
form angularjs