Changed ordering of inputs