Reorderd tmp vars