Refactor to use new pick() method