convert to using angular