Improve tone generator