revised dropdowns further, require more finesse