add db
add some partial picture support
merge