Adding better radio button check