Updates to match the documentation provided to Matt