reverted to old table code. Started new class for new gen-based table