Major Paper update.

Take into account A. Cohen's review.