updates
Merge branch 'phil'