Changes to settings, not finished