moved settings around to make more sense