Practise putting the future tense after quand Rule: if the main verb is in the future tense the verb after quand is also in the Future. In English it is a present tense.
