Updates to add improve this section and remove duplication