Improve the bracketed part of the sentence. When I (go) to Paris, I shall visit the Eiffel Tower.

• shall go
• will be going
• have to go
• no improvement