adding database and other changes