Juggled some settings around