Merged new version
Fix
Updated db