Improvement :-
He waves to me (whoever) he sees me at the window.
Poll
- whenever
- wherever
- whatever
- No improvement required