Revamped document. Lots of additions