Shuffled around some options