Adapt flash to the new design, adapt tables to the new design
not sure