Better bandling of choices