Done (I hope correctly, don't know much about the docs stuff)