More function shuffling