Need a versionadded here?