Revert a223644..a17e77f

This rolls back to commit a2236445fe1cc1865730574767ac4fbd07da7092.
Revert "Revert "Database Jac modif""

This reverts commit 7c340d43d22f96ad2123decf0ce90c590621e949.