Psm run again, yay!
Update friend assembly names
Merge branch 'master' into psm