Reworked tables, now they work good