smith updates
Merge branch 'HilSmith'