deal with flags in one spot
merge