Docstring + J.S. modifications