Bringing 3.0 up to speed with the docs from 3.1