Added better inputs.