Tweak: Change argument order to be more consistent