updated with angular model