fixed the saving for database
Merge branch 'daison-updates'