SettingsManager Patch 2