Updated angular working