some changes
Merge branch 'steve' into sean