fixed table to new format