Should we have --system here?