[Tak] Angular Improvement