new db & bug fix