New Branch
Optimized use of database
merging branches