conversion to .NET 3.5