I am struggling with this lesson a bit. I think one problem is that it's too "fat". My feeling is that it covers about twice the material of most other lessons. Due to the complexity, I would suggest breaking it up into three pieces: "attendre", "s'attendre", and "attendre vs s'attendre". It would be easier to digest - for me at least.