Reordered methods to match original examples more closely