Ray added
Picker added