added feature flag check
worky work
more worky work