Adjusted to use angular