Change argument order to accommodate partials