New doc based on PRs 4 and 5.