Updated the drop down logic