Working on database fixing