diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
index 8aa2ccd3..994e8177 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
@@ -57,13 +57,7 @@ namespace WebsitePanel.Providers.Web.WPIWebApplicationGallery
         public WPIApplicationGallery(string sufix)
         {
             _sufix = sufix;
-            //_feeds = new[]
-            //             {
-            //                 "https://www.microsoft.com/web/webpi/3.0/webproductlist.xml",
-            //                 "http://www.helicontech.com/zoo/feed/wsp"
-            //             };
             _cache = CacheFactory.GetCacheManager();
-            //_wpi = GetWpiHelper();
         }
 
 
@@ -80,8 +74,6 @@ namespace WebsitePanel.Providers.Web.WPIWebApplicationGallery
 
         public void InitFeeds(int UserId, string[] feeds)
         {
-            //Log.WriteInfo("InitFeeds {0} ", UserId);
-
             string CACHE_KEY = GetKey_Feeds(UserId);
 
             if (_cache.Contains(CACHE_KEY))
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj b/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj
index 33355971..7ef83aa9 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WebsitePanel.Server.WPIService</RootNamespace>
     <AssemblyName>WebsitePanel.Server.WPIService</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.WPIService/app.config b/WebsitePanel/Sources/WebsitePanel.Server.WPIService/app.config
new file mode 100644
index 00000000..cb2586be
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Server.WPIService/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/WindowsServer.asmx.cs b/WebsitePanel/Sources/WebsitePanel.Server/WindowsServer.asmx.cs
index 0f7e240d..5686914c 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/WindowsServer.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server/WindowsServer.asmx.cs
@@ -31,6 +31,7 @@ using System.IO;
 using System.Data;
 using System.Security;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Web;
 using System.Diagnostics;
@@ -39,7 +40,6 @@ using System.Collections.Generic;
 using System.Web.Services;
 using System.Web.Services.Protocols;
 using System.ComponentModel;
-using System.Text.RegularExpressions;
 using System.ServiceProcess;
 using System.ServiceModel;
 using System.Runtime.Remoting;
@@ -56,6 +56,11 @@ using WebsitePanel.Providers;
 using WebsitePanel.Server.WPIService;
 
 
+
+
+
+
+
 namespace WebsitePanel.Server
 {
     /// <summary>
@@ -615,31 +620,35 @@ namespace WebsitePanel.Server
             }
         }
 
+     
         private void StartWpiService()
         {
             string binFolder = HttpContext.Current.Server.MapPath("/bin/");
+            string workingDirectory = Path.Combine(Environment.ExpandEnvironmentVariables("%SystemRoot%"), "Temp\\zoo.wpi");
 
-            string newUserProfile = Path.Combine(Environment.ExpandEnvironmentVariables("%SystemRoot%"), "Temp\\zoo.wpi");
-            string newAppData = Path.Combine(newUserProfile, "Roaming");
-            string newLocalAppData = Path.Combine(newUserProfile, "Local");
-            try
-            {
-                Directory.CreateDirectory(newUserProfile);
-                Directory.CreateDirectory(newAppData);
-                Directory.CreateDirectory(newLocalAppData);
-            }
-            catch (Exception)
-            {
-                //throw;
-            }
+            //string newUserProfile = Path.Combine(Environment.ExpandEnvironmentVariables("%SystemRoot%"), "Temp\\zoo.wpi");
+            //string newAppData = Path.Combine(newUserProfile, "Roaming");
+            //string newLocalAppData = Path.Combine(newUserProfile, "Local");
+            //try
+            //{
+            //    Directory.CreateDirectory(newUserProfile);
+            //    Directory.CreateDirectory(newAppData);
+            //    Directory.CreateDirectory(newLocalAppData);
+            //}
+            //catch (Exception)
+            //{
+            //    //throw;
+            //}
 
 
             Process wpiServiceExe = new Process();
             wpiServiceExe.StartInfo = new ProcessStartInfo(Path.Combine(binFolder, "WebsitePanel.Server.WPIService.exe"));
+            wpiServiceExe.StartInfo.WorkingDirectory = workingDirectory;
             wpiServiceExe.StartInfo.UseShellExecute = false;
-            wpiServiceExe.StartInfo.EnvironmentVariables["UserProfile"] = newUserProfile;
-            wpiServiceExe.StartInfo.EnvironmentVariables["LocalAppData"] = newLocalAppData;
-            wpiServiceExe.StartInfo.EnvironmentVariables["AppData"] = newAppData;
+            wpiServiceExe.StartInfo.LoadUserProfile = true;
+            //wpiServiceExe.StartInfo.EnvironmentVariables["UserProfile"] = newUserProfile;
+            //wpiServiceExe.StartInfo.EnvironmentVariables["LocalAppData"] = newLocalAppData;
+            //wpiServiceExe.StartInfo.EnvironmentVariables["AppData"] = newAppData;
             if (wpiServiceExe.Start())
             {
                 _WpiServiceExe = wpiServiceExe;
@@ -983,4 +992,6 @@ namespace WebsitePanel.Server
         }
         #endregion
     }
+
+ 
 }