improvements to the Choice api