I listed both - if this doesn't read clearly, I can rephrase