switched to the new chooser system