Add back the choices, change the separator options