Performance on the table cells is terrible

No more recursion