Merge with proper database
Merge with proper database