More david changes