Big refactoring to the tuner link