change the organization of arguments in tour