Amended the dropdown so its more versatile