Made replacements and additions as per doc