some changes
angular working