Added recursion back into TableView