totally reworked db