Revert "Multi guy update"

This reverts commit 4b6d999126a2dd0c048f6e3518a98d40d5e95995.
Revert "Revert "Multi guy update""

This reverts commit 3c3d9ed5b95cc30ff6a2714c073ec3758082e505.