diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 4611b51..ec1299c 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -80,6 +80,8 @@ image_data_argb.c \
 image_data_argb_alpha.c \
 image_data_ycbcr601pl.c \
 image_data_ycbcr601pl_wide_stride.c \
+image_data_ycbcr601pl_map_solid_rotate.c \
+image_data_ycbcr601pl_map_nearest_solid_rotate.c \
 image_crossfade.c \
 text_basic.c \
 text_styles.c \
diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
new file mode 100644
index 0000000..6587715
--- /dev/null
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -0,0 +1,149 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_data_ycbcr601pl_map_nearest_solid_rotate_start
+#define NAME "Image Data YCbCr 601 Pointer List Map Nearest Solid Rotate"
+#define ICON "data.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+
+/* private data */
+static Evas_Object *o_images[1];
+static unsigned char *yp = NULL, *up = NULL, *vp = NULL;
+
+/* setup */
+static void _setup(void)
+{
+   int i, y;
+   FILE *f;
+   unsigned char **data, **lp;
+   Evas_Object *o;
+   for (i = 0; i < 1; i++)
+     {
+	o = evas_object_image_add(evas);
+	o_images[i] = o;
+        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+        evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
+        evas_object_image_size_set(o, 640, 480);
+        evas_object_image_alpha_set(o, 0);
+        evas_object_image_fill_set(o, 0, 0, 640, 480);
+        evas_object_resize(o, 640, 480);
+        evas_object_image_smooth_scale_set(o, 0);
+	evas_object_show(o);
+        yp = malloc(640 * 480);
+        up = malloc(320 * 240);
+        vp = malloc(320 * 240);
+        f = fopen(build_path("tp.yuv"), "rb");
+        if (f)
+          {
+             fread(yp, 640 * 480, 1, f);
+             fread(up, 320 * 240, 1, f);
+             fread(vp, 320 * 240, 1, f);
+             fclose(f);
+          }
+        data = evas_object_image_data_get(o_images[i], 1);
+        lp = data;
+        for (y = 0; y < 480; y++)
+          {
+             *lp = yp + (y * 640);
+             lp++;
+          }
+        for (y = 0; y < 240; y++)
+          {
+             *lp = up + (y * 320);
+             lp++;
+          }
+        for (y = 0; y < 240; y++)
+          {
+             *lp = vp + (y * 320);
+             lp++;
+          }
+        evas_object_image_data_set(o_images[i], data);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   free(yp);
+   free(up);
+   free(vp);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Map *m;
+   Evas_Coord x, y, w, h;
+   m = evas_map_new(4);
+   evas_map_smooth_set(m, 0);
+   for (i = 0; i < 1; i++)
+     {
+        w = 640;
+	h = 480;
+	x = (win_w / 2) - (w / 2);
+	y = (win_h / 2) - (h / 2);
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
+        evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
+
+        evas_object_map_enable_set(o_images[i], 1);
+        evas_object_map_set(o_images[i], m);
+     }
+   evas_map_free(m);
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
new file mode 100644
index 0000000..6054946
--- /dev/null
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -0,0 +1,147 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_data_ycbcr601pl_map_solid_rotate_start
+#define NAME "Image Data YCbCr 601 Pointer List Map Solid Rotate"
+#define ICON "data.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+
+/* private data */
+static Evas_Object *o_images[1];
+static unsigned char *yp = NULL, *up = NULL, *vp = NULL;
+
+/* setup */
+static void _setup(void)
+{
+   int i, y;
+   FILE *f;
+   unsigned char **data, **lp;
+   Evas_Object *o;
+   for (i = 0; i < 1; i++)
+     {
+	o = evas_object_image_add(evas);
+	o_images[i] = o;
+        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+        evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
+        evas_object_image_size_set(o, 640, 480);
+        evas_object_image_alpha_set(o, 0);
+        evas_object_image_fill_set(o, 0, 0, 640, 480);
+        evas_object_resize(o, 640, 480);
+	evas_object_show(o);
+        yp = malloc(640 * 480);
+        up = malloc(320 * 240);
+        vp = malloc(320 * 240);
+        f = fopen(build_path("tp.yuv"), "rb");
+        if (f)
+          {
+             fread(yp, 640 * 480, 1, f);
+             fread(up, 320 * 240, 1, f);
+             fread(vp, 320 * 240, 1, f);
+             fclose(f);
+          }
+        data = evas_object_image_data_get(o_images[i], 1);
+        lp = data;
+        for (y = 0; y < 480; y++)
+          {
+             *lp = yp + (y * 640);
+             lp++;
+          }
+        for (y = 0; y < 240; y++)
+          {
+             *lp = up + (y * 320);
+             lp++;
+          }
+        for (y = 0; y < 240; y++)
+          {
+             *lp = vp + (y * 320);
+             lp++;
+          }
+        evas_object_image_data_set(o_images[i], data);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   free(yp);
+   free(up);
+   free(vp);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Map *m;
+   Evas_Coord x, y, w, h;
+   m = evas_map_new(4);
+   for (i = 0; i < 1; i++)
+     {
+        w = 640;
+	h = 480;
+	x = (win_w / 2) - (w / 2);
+	y = (win_h / 2) - (h / 2);
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
+        evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
+
+        evas_object_map_enable_set(o_images[i], 1);
+        evas_object_map_set(o_images[i], m);
+     }
+   evas_map_free(m);
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/tests.h b/src/bin/tests.h
index 66e48b0..79ca9db 100644
--- a/src/bin/tests.h
+++ b/src/bin/tests.h
@@ -56,6 +56,8 @@
 #include "image_data_argb_alpha.c"
 #include "image_data_ycbcr601pl.c"
 #include "image_data_ycbcr601pl_wide_stride.c"
+#include "image_data_ycbcr601pl_map_solid_rotate.c"
+#include "image_data_ycbcr601pl_map_nearest_solid_rotate.c"
 #include "image_crossfade.c"
 #include "text_basic.c"
 #include "text_styles.c"
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 98c44e1..30f2b9f 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -110,6 +110,8 @@ static double weights[] =
      23.4462,
      14.7573,
      36.5261,
+      5.0000,
+      5.0000,
      24.3482,
      10.4611,
      86.0290,
@@ -136,8 +138,12 @@ static double weights[] =
      22.0342,
      38.2952,
      5.5560,
-     
-     0.0 // no final test - add a 0 at the end anyway to pad
+     0.5000,
+   
+     0.0, // no final test - add a 0 at the end anyway to pad
+     0.0,
+     0.0,
+     0.0
 };
 
 static void