Rearrange the sequence of routine parameters too