Some rearrangement of arguments