The following PR has been updated, please review

Thank you