now working with angular