add more angularizing