Reordered how the parameters are entered