Feature enhanced settings

Feature enhanced settings