Now new recursion should work, but still to be tested