some drop list changes
merged