added feature flag