US538: Refactored code for Radio group