Shuffle some functions around