Should this be passing through the flags?