Changed to radio and checkbox