rework angularjs stuff