Add ability to pick by numbers only