Improve the bracketed part of the sentence.

When I(go)to Paris, I shall visit the Eiffel Tower.

A

shall go

B

will be going

C

have to go

D

no improvement