changes for database 2