Is this still correct? Seems the docs need some tweaking.