2nd attempt with angular