Readd rf switches. grrr
Restore more symbols