[Tak] Improvements Made