Finally working, and we can reenable DB :)