Added vanilla and empirical tuners and tunes