Shuffled around more things