redo structure, needs db:reset