Now allows all values to be input on one screen