modified with angular