Update to use angular