Attempting to improve the selec inputs.