db and other changes