final changes and DB