Recursive stuff seems ok now