dev ok: expande table
dev ok haha