-- The film Tangshan Earthquake will be at 7:30 pro. Shall I pick you up at 6:40 pm?

-- OK, I _____ you at that time.  [ ]

A. was waiting for                

B. shall be waiting for

C. have been waiting for          

D. shall have waited for