[Tak] Improved Functionality