Solved - no recursion