updated with angular