Angular rework