Update to Table; added rowspan