added tabling_slots
merged