with table and new structure