already implemented ;) currently testing the changes before i push them to the pull request