Castillo closes on Mexico move