Settings enhanced as desired