Updated C# version, not tested