Still fixing db