Fixed some UPSMOn calls
Readded accidentally deleted files.