Better regenerating after Settings Change