Working update from collaboration

Worked remotely on MFG servers. This is the copy download.