Changes to pick up selected option value