adding tone support, rate control support