edited TODO
removed running variable
added calculation method