added new db fields
merge?