Debugging and combining part of tavi and me