fixed db schema, partial back as it was