more function arg reordering