- reworked db