new version with new database
Integration of code