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