more changes to picker class