Merge branch 'doug'
update