Partial Conversion to Angular