#152 progress with Table