Modified Table numbering 1->S1 etc etc