#RF settings refactored