Shuffle configuration a bit, make it easier