diff --git a/vp4dc.c b/vp4dc.c
index 5122b89..b71c883 100644
--- a/vp4dc.c
+++ b/vp4dc.c
@@ -1,5 +1,5 @@
 /**
-    Copyright (C) powturbo 2013-2015
+    Copyright (C) powturbo 2013-2016
     GPL v2 License
   
     This program is free software; you can redistribute it and/or modify
@@ -35,6 +35,7 @@
 
 #define P4D p4d
 #define P4DENC p4denc
+#define P4DNENC p4dnenc
 #define P4DE p4de
 
 #define BITPACK bitpack
@@ -52,11 +53,12 @@
 
 #undef BITPACK 
 #undef P4DENC
+#undef P4DNENC
 #undef P4DE
 #undef P4D
 //------------------------------------------
-
 #define P4DENC p4dencv
+#define P4DNENC p4dnencv
 #define P4DE p4dev
 #define BITPACK bitpackv
 #define USIZE 32
@@ -71,6 +73,8 @@
 #define P4DN   (P4DSIZE/64)
 
     #ifdef P4D
+//#define MINCALC(_i_) { l = PAD8(n*_i_) + PAD8(x*(bx-_i_)); x += cnt[_i_]; if(unlikely(l < ml)) b = _i_, ml = l; }
+#define MINCALC(_i_) { l = PAD8(n*_i_) + PAD8(x*(bx-_i_)); x += cnt[_i_]; unlikely(l < ml)?(ml=l,b=_i_):(ml=ml,b=b); }
 unsigned TEMPLATE2(P4D, USIZE)(uint_t *__restrict in, unsigned n, unsigned *pbx) {
   uint_t *ip,b=0; int i,ml,l; unsigned x, bx, cnt[USIZE+1] = {0}; 
   
@@ -84,10 +88,46 @@ unsigned TEMPLATE2(P4D, USIZE)(uint_t *__restrict in, unsigned n, unsigned *pbx)
   b = TEMPLATE2(bsr, USIZE)(b); 
 
   bx = b; ml = PAD8(n*b)+1-2-P4DN*8; x = cnt[b];
-  for(i = b-1; i >= 0; --i) {
-    l = PAD8(n*i) + PAD8(x*(bx-i)); x += cnt[i]; 
-	if(unlikely(l < ml)) b = i, ml = l;
+    #if 0 //USIZE > 32 
+  for(i = b-1; i >= 0; --i) MINCALC(i);  //    l = PAD8(n*i) + PAD8(x*(bx-i)); x += cnt[i]; if(unlikely(l < ml)) b = i, ml = l;
+    #else
+  switch(b-1) {
+	case 31: MINCALC(31);
+	case 30: MINCALC(30);
+	case 29: MINCALC(29);
+	case 28: MINCALC(28);
+	case 27: MINCALC(27);
+	case 26: MINCALC(26);
+	case 25: MINCALC(25);
+	case 24: MINCALC(24);	
+	case 23: MINCALC(23);
+	case 22: MINCALC(22);
+	case 21: MINCALC(21);
+	case 20: MINCALC(20);
+	
+	case 19: MINCALC(19);
+	case 18: MINCALC(18);
+	case 17: MINCALC(17);
+	case 16: MINCALC(16);
+	case 15: MINCALC(15);
+	case 14: MINCALC(14);	
+	case 13: MINCALC(13);
+	case 12: MINCALC(12);
+	case 11: MINCALC(11);
+	case 10: MINCALC(10);
+	
+	case  9: MINCALC( 9);
+	case  8: MINCALC( 8);
+	case  7: MINCALC( 7);
+	case  6: MINCALC( 6);
+	case  5: MINCALC( 5);
+	case  4: MINCALC( 4);	
+	case  3: MINCALC( 3);
+	case  2: MINCALC( 2);
+	case  1: MINCALC( 1);
+	case  0: MINCALC( 0);
   }
+    #endif
   *pbx = bx - b;
   return b;
 } 
@@ -116,20 +156,27 @@ unsigned char *TEMPLATE2(P4DE, USIZE)(uint_t *__restrict in, unsigned n, unsigne
     xmap[c>>6] |= (1ull << (c&0x3f)); 
     inx[i]      = in[c] >> b; 
   }
-  out = TEMPLATE2(BITPACK, USIZE)(_in,  n, out,  b);	
     #if P4DN == 2
   *(unsigned long long *)out = xmap[0]; out += 8;    
   *(unsigned long long *)out = xmap[1]; out += 8;    
     #else
   for(i=0;i < P4DN; i++) { *(unsigned long long *)out = xmap[i]; out += 8; } 
     #endif
-  return TEMPLATE2(bitpack, USIZE)(inx, xn, out, bx);  						
+  out = TEMPLATE2(bitpack, USIZE)(inx, xn, out, bx);  						
+  return TEMPLATE2(BITPACK, USIZE)(_in,  n, out,  b);	
 }
 
 unsigned char *TEMPLATE2(P4DENC, USIZE)(uint_t *__restrict in, unsigned n, unsigned char *__restrict out) {  
   unsigned bx,b = TEMPLATE2(p4d, USIZE)(in, n, &bx);
-  P4DSAVE(out, b, bx);
+  P4DSAVE(out, b, bx); 
   return TEMPLATE2(P4DE, USIZE)(in, n, out, b, bx);
 }
+
+unsigned char *TEMPLATE2(P4DNENC, USIZE)(uint_t *__restrict in, unsigned n, unsigned char *__restrict out) {
+  uint_t *ip;
+  for(ip = in; ip < in+n; ip += P4DSIZE) { unsigned l = (in+n) - ip; l = min(l, P4DSIZE);      
+    out = TEMPLATE2(P4DENC, USIZE)(ip, l, out);;                           
+  }
+}
 #pragma clang diagnostic pop
   #endif