Additional changes
Merge branch 'Dave'