Working version for drop down

Need to clean