[Tak] Bug fixed and Improved Callback