Shuffled around settings
Merged