Wow, my brains must really be scrambled; you had the date, you had the locations, and it still did not register. You are correct that Baja is part of Mexico, at least until they discover offshore oil (joke).
Chris