Use new argument list throughout