Shuffled around some things