changes to make DB commit work