added RF support back in (untested)