Change argument order to make more consistent