Additional work on the Picker