Angular changes

Some Angular changes