Updated doc.
 Simplified everything.