Rearranged to only use angular