minimal changes and DB.