further improved our db setup