I think you're correct. I do like the addition of "Both" for clarity, will do.