Added 'picker-upper' code