Final touches to angular way