manage optional features

manage optional features