more widespread feature flagging