DB draft
merge fix