merging from David