Early work for settings
After merge