added statePicker
merged