Docstring added, etc