Converted it to angular