Replaced config values with our own that function properly