Shuffled some settings around