Yes, this seems to be correct. I heard a pundit last night say it's NOT the same facility he worked in. But I think the pundit was wrong.
They just repeated it on Fox, so I think it's true.