(Settings data) More shuffling around