diff --git a/src/main/java/org/apache/usergrid/java/client/UsergridClient.java b/src/main/java/org/apache/usergrid/java/client/UsergridClient.java
index a317d07..0ec28c8 100644
--- a/src/main/java/org/apache/usergrid/java/client/UsergridClient.java
+++ b/src/main/java/org/apache/usergrid/java/client/UsergridClient.java
@@ -33,7 +33,7 @@
 @SuppressWarnings("unused")
 public class UsergridClient {
 
-    @NotNull public static String DEFAULT_BASE_URL = "https://api.usergrid.com";
+    @NotNull public static String DEFAULT_BASE_URL = "https://apibaas-trial.apigee.net";
 
     @NotNull private UsergridClientConfig config;
     @Nullable private UsergridUser currentUser = null;
diff --git a/src/test/java/org/apache/usergrid/client/SDKTestConfiguration.java b/src/test/java/org/apache/usergrid/client/SDKTestConfiguration.java
index e92e7be..8acf65f 100644
--- a/src/test/java/org/apache/usergrid/client/SDKTestConfiguration.java
+++ b/src/test/java/org/apache/usergrid/client/SDKTestConfiguration.java
@@ -19,20 +19,14 @@
 import org.apache.usergrid.java.client.UsergridEnums.UsergridAuthMode;
 
 public class SDKTestConfiguration {
-    public static final String APP_CLIENT_ID = "b3U6THNcevskEeOQZLcUROUUVA"; //"YXA6_j0WsfFCEeWKoy6txsCOfA" ;
-    public static final String APP_CLIENT_SECRET = "b3U6RZHYznP28xieBzQPackFPmmnevU"; //"YXA6jg8x4wjq1AAyQBKtn4bRd1l0gJ8"; //
+    public static final String APP_CLIENT_ID = "YXA6-zvnTdLWEeaGGwrYgfQDvw";
+    public static final String APP_CLIENT_SECRET = "YXA64tQ5qQAW_IZYUAOn_tDRKz0HrAU";
 
-    public static final String APP_UserName = "javaSDK"; //"test";// //"b3U66ne33W4OEeWXmAIj6QFb-Q";
-    public static final String APP_Password = "Apigee123"; //"test";//"b3U6PxbpQiTrXKCWu0n1CjK1uTZXuG4";
-    public static final String USERGRID_URL = "https://api.usergrid.com/";
-    public static final String ORG_NAME = "rwalsh";
+    public static final String APP_UserName = "javaSDK";
+    public static final String APP_Password = "Apigee123";
+    public static final String USERGRID_URL = "https://apibaas-trial.apigee.net/";
+    public static final String ORG_NAME = "rjwalsh";
     public static final String APP_NAME = "sdk.demo";
 
     public static UsergridAuthMode authFallBack = UsergridAuthMode.APP;
-
-//  public static final String APP_CLIENT_ID = "YXA61n2kpFffEeWs9QLknKqhHw";
-//  public static final String APP_CLIENT_SECRET = "YXA69_aRW1IHLgMTUUYSitsGwOLY8uQ";
-//  public static final String USERGRID_URL = "https://fhirsandbox-prod.apigee.net/appservices";
-//  public static final String ORG_NAME = "usergrid";
-//  public static final String APP_NAME = "sandbox";
 }
diff --git a/usergrid-java-client-2.1.0.jar b/usergrid-java-client-2.1.0.jar
index fa90a59..649edfa 100644
Binary files a/usergrid-java-client-2.1.0.jar and b/usergrid-java-client-2.1.0.jar differ