debug after refactor

Now we have a debugged version after the refactor