Updated to reflect xplat work at msft