Merge branch 'Soto'
new stuff 2