diff --git a/AUTHORS b/AUTHORS
index 1694b5f..414ee67 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,4 @@
 The Rasterman (Carsten Haitzler) <raster@rasterman.com>
 Tim Horton <hortont424@gmail.com>
+Saumsung Electronics <tbd>
+Samsung SAIT <tbd>
diff --git a/src/bin/engine_software_xlib.c b/src/bin/engine_software_xlib.c
index cdd7841..332b12e 100644
--- a/src/bin/engine_software_xlib.c
+++ b/src/bin/engine_software_xlib.c
@@ -37,6 +37,16 @@ engine_software_xlib_args(const char *engine, int width, int height)
    einfo->info.depth = einfo->func.best_depth_get(0, disp, DefaultScreen(disp));
    einfo->info.rotation = 0;
    einfo->info.debug = 0;
+#ifdef EVAS_FRAME_QUEUING
+  {
+     char    *render_mode;
+     render_mode = getenv("EVAS_RENDER_MODE");
+     if (render_mode && !strcmp(render_mode, "non-blocking"))
+       {
+           einfo->render_mode = EVAS_RENDER_MODE_NONBLOCKING;
+       }
+  }
+#endif
    attr.backing_store = NotUseful;
    attr.colormap = einfo->info.colormap;
    attr.border_pixel = 0;
diff --git a/src/bin/main.c b/src/bin/main.c
index 7f8ac7d..2b9158a 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1357,6 +1357,7 @@ int
 main(int argc, char **argv)
 {
    int i;
+   XInitThreads();
 
    evas_init();
    evas = evas_new();
diff --git a/src/bin/main.h b/src/bin/main.h
index 2dfb0c2..1102783 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -84,6 +84,8 @@ extern "C"
 #include "ui.h"
 #include "about.h"
 
+#define EVAS_FRAME_QUEUING	// for test
+
 #define OBNUM 128
 #define LOOPS 128