add database and some changes
add database and some changes