tuner: yet another improvement attempt