improve option pick