make this feature configurable