Update so it works with .net 3.5