diver radio refactor