refactored to angular