V.3 - without plotting and with more docstrings