Updating the document following Ami's comments and suggestions