Re-wrote lost code on the Table class