Update to make radio groups work