angularification, not so bad now