How do I say "are you going to visit Tokyo when you return to Japan" in Japanese? Is it right to say "日本に帰ったとき、東京にくるの？” (I'm asking informally btw)