[Tak] Functionality fully recoverd, preparing to build the filter