diff --git a/Algo256/cuda_skein256.cu b/Algo256/cuda_skein256.cu
index deab7df..2f1bc82 100644
--- a/Algo256/cuda_skein256.cu
+++ b/Algo256/cuda_skein256.cu
@@ -2,79 +2,40 @@
 
 #include "cuda_helper.h"
 
-static __constant__ uint64_t SKEIN_IV512_256[8] = {
-	0xCCD044A12FDB3E13, 0xE83590301A79A9EB,
-	0x55AEA0614F816E6F, 0x2A2767A4AE9B94DB,
-	0xEC06025E74DD7683, 0xE7A436CDC4746251,
-	0xC36FBAF9393AD185, 0x3EEDBA1833EDFC13
-};
-
-static __constant__ uint2 vSKEIN_IV512_256[8] = {
-	{ 0x2FDB3E13, 0xCCD044A1 },
-	{ 0x1A79A9EB, 0xE8359030 },
-	{ 0x4F816E6F, 0x55AEA061 },
-	{ 0xAE9B94DB, 0x2A2767A4 },
-	{ 0x74DD7683, 0xEC06025E },
-	{ 0xC4746251, 0xE7A436CD },
-	{ 0x393AD185, 0xC36FBAF9 },
-	{ 0x33EDFC13, 0x3EEDBA18 }
-};
-
-static __constant__ int8_t ROT256[8][4] = {
-	46, 36, 19, 37,
-	33, 27, 14, 42,
-	17, 49, 36, 39,
-	44,  9, 54, 56,
-	39, 30, 34, 24,
-	13, 50, 10, 17,
-	25, 29, 39, 43,
-	8,  35, 56, 22,
-};
-
-static __constant__ uint2 t12[6] = {
-	{ 0x20,	0 },
-	{ 0,	0xf0000000 },
-	{ 0x20,	0xf0000000 },
-	{ 0x08,	0 },
-	{ 0,	0xff000000 },
-	{ 0x08,	0xff000000 }
-};
-
-static __constant__ uint2 skein_ks_parity = { 0xA9FC1A22, 0x1BD11BDA };
-static __constant__ uint64_t skein_ks_parity64 = 0x1BD11BDAA9FC1A22ull;
-
-
 static __forceinline__ __device__
-void Round512v35(uint2 &p0, uint2 &p1, uint2 &p2, uint2 &p3, uint2 &p4, uint2 &p5, uint2 &p6, uint2 &p7, int ROT)
+void Round512v35(uint2 &p0, uint2 &p1, uint2 &p2, uint2 &p3, uint2 &p4, uint2 &p5, uint2 &p6, uint2 &p7,
+	const int ROT0, const int ROT1, const int ROT2, const int ROT3)
 {
-	p0 += p1; p1 = ROL2(p1, ROT256[ROT][0]) ^ p0;
-	p2 += p3; p3 = ROL2(p3, ROT256[ROT][1]) ^ p2;
-	p4 += p5; p5 = ROL2(p5, ROT256[ROT][2]) ^ p4;
-	p6 += p7; p7 = ROL2(p7, ROT256[ROT][3]) ^ p6;
+	p0 += p1; p1 = ROL2(p1, ROT0) ^ p0;
+	p2 += p3; p3 = ROL2(p3, ROT1) ^ p2;
+	p4 += p5; p5 = ROL2(p5, ROT2) ^ p4;
+	p6 += p7; p7 = ROL2(p7, ROT3) ^ p6;
 }
 
-static __forceinline__ __device__
-void Round_8_512v35(uint2 *ks, uint2 *ts,
-                    uint2 &p0, uint2 &p1, uint2 &p2, uint2 &p3,
-                    uint2 &p4, uint2 &p5, uint2 &p6, uint2 &p7, int R)
+__forceinline__ __device__
+void Round_8_512v35(const uint2 *const __restrict__ ks, const uint2 *const __restrict__ ts,
+	uint2 &p0, uint2 &p1, uint2 &p2, uint2 &p3, uint2 &p4, uint2 &p5, uint2 &p6, uint2 &p7, int R)
 {
-	Round512v35(p0, p1, p2, p3, p4, p5, p6, p7, 0);
-	Round512v35(p2, p1, p4, p7, p6, p5, p0, p3, 1);
-	Round512v35(p4, p1, p6, p3, p0, p5, p2, p7, 2);
-	Round512v35(p6, p1, p0, p7, p2, p5, p4, p3, 3);
-	p0 += ks[(R+0) % 9];   /* inject the key schedule value */
+	Round512v35(p0, p1, p2, p3, p4, p5, p6, p7, 46, 36, 19, 37);
+	Round512v35(p2, p1, p4, p7, p6, p5, p0, p3, 33, 27, 14, 42);
+	Round512v35(p4, p1, p6, p3, p0, p5, p2, p7, 17, 49, 36, 39);
+	Round512v35(p6, p1, p0, p7, p2, p5, p4, p3, 44,  9, 54, 56);
+
+	p0 += ks[(R+0) % 9];
 	p1 += ks[(R+1) % 9];
 	p2 += ks[(R+2) % 9];
 	p3 += ks[(R+3) % 9];
 	p4 += ks[(R+4) % 9];
 	p5 += ks[(R+5) % 9] + ts[(R+0) % 3];
 	p6 += ks[(R+6) % 9] + ts[(R+1) % 3];
-	p7 += ks[(R+7) % 9] + make_uint2((R),0);
-	Round512v35(p0, p1, p2, p3, p4, p5, p6, p7, 4);
-	Round512v35(p2, p1, p4, p7, p6, p5, p0, p3, 5);
-	Round512v35(p4, p1, p6, p3, p0, p5, p2, p7, 6);
-	Round512v35(p6, p1, p0, p7, p2, p5, p4, p3, 7);
-	p0 += ks[(R+1) % 9];   /* inject the key schedule value */
+	p7 += ks[(R+7) % 9] + make_uint2(R, 0);
+
+	Round512v35(p0, p1, p2, p3, p4, p5, p6, p7, 39, 30, 34, 24);
+	Round512v35(p2, p1, p4, p7, p6, p5, p0, p3, 13, 50, 10, 17);
+	Round512v35(p4, p1, p6, p3, p0, p5, p2, p7, 25, 29, 39, 43);
+	Round512v35(p6, p1, p0, p7, p2, p5, p4, p3, 8,  35, 56, 22);
+
+	p0 += ks[(R+1) % 9];
 	p1 += ks[(R+2) % 9];
 	p2 += ks[(R+3) % 9];
 	p3 += ks[(R+4) % 9];
@@ -84,38 +45,83 @@ void Round_8_512v35(uint2 *ks, uint2 *ts,
 	p7 += ks[(R+8) % 9] + make_uint2(R+1, 0);
 }
 
+__forceinline__ __device__
+void Round_8_512v35_final(const uint2 *const __restrict__ ks, const uint2 *const __restrict__ ts,
+	uint2 &p0, uint2 &p1, uint2 &p2, uint2 &p3, uint2 &p4, uint2 &p5, uint2 &p6, uint2 &p7)
+{
+	Round512v35(p0, p1, p2, p3, p4, p5, p6, p7, 46, 36, 19, 37);
+	Round512v35(p2, p1, p4, p7, p6, p5, p0, p3, 33, 27, 14, 42);
+	Round512v35(p4, p1, p6, p3, p0, p5, p2, p7, 17, 49, 36, 39);
+	Round512v35(p6, p1, p0, p7, p2, p5, p4, p3, 44, 9, 54, 56);
+
+	p0 += ks[8];
+	p1 += ks[0];
+	p2 += ks[1];
+	p3 += ks[2];
+	p4 += ks[3];
+	p5 += ks[4] + ts[2];
+	p6 += ks[5] + ts[0];
+	p7 += ks[6] + make_uint2(17, 0);
+
+	Round512v35(p0, p1, p2, p3, p4, p5, p6, p7, 39, 30, 34, 24);
+	Round512v35(p2, p1, p4, p7, p6, p5, p0, p3, 13, 50, 10, 17);
+	Round512v35(p4, p1, p6, p3, p0, p5, p2, p7, 25, 29, 39, 43);
+	Round512v35(p6, p1, p0, p7, p2, p5, p4, p3, 8,  35, 56, 22);
+
+	p0 += ks[0];
+	p1 += ks[1];
+	p2 += ks[2];
+	p3 += ks[3];
+}
 
 __global__ __launch_bounds__(256,3)
 void skein256_gpu_hash_32(uint32_t threads, uint32_t startNounce, uint64_t *outputHash)
 {
 	const uint32_t thread = (blockDim.x * blockIdx.x + threadIdx.x);
+
 	if (thread < threads)
 	{
-		uint2 h[9], t[3] = { t12[0], t12[1], t12[2] };
-
-		h[8] = skein_ks_parity;
-		for (int i = 0; i<8; i++) {
-			h[i] = vSKEIN_IV512_256[i];
-			h[8] ^= h[i];
-		}
-
-		uint2 dt0 = vectorize(outputHash[thread]);
-		uint2 dt1 = vectorize(outputHash[threads   + thread]);
-		uint2 dt2 = vectorize(outputHash[threads*2 + thread]);
-		uint2 dt3 = vectorize(outputHash[threads*3 + thread]);
-
-		uint2 p0 = h[0] + dt0;
-		uint2 p1 = h[1] + dt1;
-		uint2 p2 = h[2] + dt2;
-		uint2 p3 = h[3] + dt3;
-		uint2 p4 = h[4];
-		uint2 p5 = h[5] + t[0];
-		uint2 p6 = h[6] + t[1];
-		uint2 p7 = h[7];
-
-		#pragma unroll 9
+		const uint2 skein_ks_parity = { 0xA9FC1A22, 0x1BD11BDA };
+		const uint2 t12[6] = {
+			{ 0x20, 0 },
+			{ 0,    0xf0000000 },
+			{ 0x20, 0xf0000000 },
+			{ 0x08, 0 },
+			{ 0,    0xff000000 },
+			{ 0x08, 0xff000000 }
+		};
+
+		uint2 h[9] = {
+			{ 0x2FDB3E13, 0xCCD044A1 },
+			{ 0x1A79A9EB, 0xE8359030 },
+			{ 0x4F816E6F, 0x55AEA061 },
+			{ 0xAE9B94DB, 0x2A2767A4 },
+			{ 0x74DD7683, 0xEC06025E },
+			{ 0xC4746251, 0xE7A436CD },
+			{ 0x393AD185, 0xC36FBAF9 },
+			{ 0x33EDFC13, 0x3EEDBA18 },
+			{ 0xC73A4E2A, 0xB69D3CFC }
+		};
+		uint2 dt0,dt1,dt2,dt3;
+		uint2 p0, p1, p2, p3, p4, p5, p6, p7;
+
+		LOHI(dt0.x,dt0.y,outputHash[thread]);
+		LOHI(dt1.x,dt1.y,outputHash[threads+thread]);
+		LOHI(dt2.x,dt2.y,outputHash[2*threads+thread]);
+		LOHI(dt3.x,dt3.y,outputHash[3*threads+thread]);
+
+		p0 = h[0] + dt0;
+		p1 = h[1] + dt1;
+		p2 = h[2] + dt2;
+		p3 = h[3] + dt3;
+		p4 = h[4];
+		p5 = h[5] + t12[0];
+		p6 = h[6] + t12[1];
+		p7 = h[7];
+
+		#pragma unroll
 		for (int i = 1; i<19; i+=2) {
-			Round_8_512v35(h, t, p0, p1, p2, p3, p4, p5, p6, p7, i);
+			Round_8_512v35(h,t12,p0,p1,p2,p3,p4,p5,p6,p7,i);
 		}
 
 		p0 ^= dt0;
@@ -131,51 +137,46 @@ void skein256_gpu_hash_32(uint32_t threads, uint32_t startNounce, uint64_t *outp
 		h[5] = p5;
 		h[6] = p6;
 		h[7] = p7;
-		h[8] = skein_ks_parity;
+		h[8] = skein_ks_parity ^ h[0] ^ h[1] ^ h[2] ^ h[3] ^ h[4] ^ h[5] ^ h[6] ^ h[7];
 
-		#pragma unroll 8
-		for (int i = 0; i<8; i++) {
-			h[8] ^= h[i];
-		}
-
-		t[0] = t12[3];
-		t[1] = t12[4];
-		t[2] = t12[5];
-
-		p5 += t[0];
-		p6 += t[1];
+		const uint2 *t = t12+3;
+		p5 += t12[3];  //p5 already equal h[5]
+		p6 += t12[4];
 
-		#pragma unroll 9
-		for (int i = 1; i<19; i+=2) {
+		#pragma unroll
+		for (int i = 1; i<17; i+=2)	{
 			Round_8_512v35(h, t, p0, p1, p2, p3, p4, p5, p6, p7, i);
 		}
-
-		outputHash[thread]             = devectorize(p0);
-		outputHash[threads   + thread] = devectorize(p1);
-		outputHash[threads*2 + thread] = devectorize(p2);
-		outputHash[threads*3 + thread] = devectorize(p3);
+		Round_8_512v35_final(h, t, p0, p1, p2, p3, p4, p5, p6, p7);
+		outputHash[thread]           = devectorize(p0);
+		outputHash[threads+thread]   = devectorize(p1);
+		outputHash[2*threads+thread] = devectorize(p2);
+		outputHash[3*threads+thread] = devectorize(p3);
 	}
 }
 
 static __forceinline__ __device__
 void Round512v30(uint64_t &p0, uint64_t &p1, uint64_t &p2, uint64_t &p3,
-	uint64_t &p4, uint64_t &p5, uint64_t &p6, uint64_t &p7, int ROT)
+	uint64_t &p4, uint64_t &p5, uint64_t &p6, uint64_t &p7,
+	const int ROT0, const int ROT1, const int ROT2, const int ROT3)
 {
-	p0 += p1; p1 = ROTL64(p1, ROT256[ROT][0]) ^ p0;
-	p2 += p3; p3 = ROTL64(p3, ROT256[ROT][1]) ^ p2;
-	p4 += p5; p5 = ROTL64(p5, ROT256[ROT][2]) ^ p4;
-	p6 += p7; p7 = ROTL64(p7, ROT256[ROT][3]) ^ p6;
+	p0 += p1; p1 = ROTL64(p1, ROT0) ^ p0;
+	p2 += p3; p3 = ROTL64(p3, ROT1) ^ p2;
+	p4 += p5; p5 = ROTL64(p5, ROT2) ^ p4;
+	p6 += p7; p7 = ROTL64(p7, ROT3) ^ p6;
 }
 
 static __forceinline__ __device__
-void Round_8_512v30(uint64_t *ks, uint64_t *ts, uint64_t &p0, uint64_t &p1, uint64_t &p2, uint64_t &p3,
+void Round_8_512v30(uint64_t *ks, uint64_t *ts,
+	uint64_t &p0, uint64_t &p1, uint64_t &p2, uint64_t &p3,
 	uint64_t &p4, uint64_t &p5, uint64_t &p6, uint64_t &p7, int R)
 {
-	Round512v30(p0, p1, p2, p3, p4, p5, p6, p7, 0);
-	Round512v30(p2, p1, p4, p7, p6, p5, p0, p3, 1);
-	Round512v30(p4, p1, p6, p3, p0, p5, p2, p7, 2);
-	Round512v30(p6, p1, p0, p7, p2, p5, p4, p3, 3);
-	p0 += ks[(R+0) % 9];   /* inject the key schedule value */
+	Round512v30(p0, p1, p2, p3, p4, p5, p6, p7, 46, 36, 19, 37);
+	Round512v30(p2, p1, p4, p7, p6, p5, p0, p3, 33, 27, 14, 42);
+	Round512v30(p4, p1, p6, p3, p0, p5, p2, p7, 17, 49, 36, 39);
+	Round512v30(p6, p1, p0, p7, p2, p5, p4, p3, 44,  9, 54, 56);
+
+	p0 += ks[(R+0) % 9];
 	p1 += ks[(R+1) % 9];
 	p2 += ks[(R+2) % 9];
 	p3 += ks[(R+3) % 9];
@@ -183,11 +184,13 @@ void Round_8_512v30(uint64_t *ks, uint64_t *ts, uint64_t &p0, uint64_t &p1, uint
 	p5 += ks[(R+5) % 9] + ts[(R+0) % 3];
 	p6 += ks[(R+6) % 9] + ts[(R+1) % 3];
 	p7 += ks[(R+7) % 9] + R;
-	Round512v30(p0, p1, p2, p3, p4, p5, p6, p7, 4);
-	Round512v30(p2, p1, p4, p7, p6, p5, p0, p3, 5);
-	Round512v30(p4, p1, p6, p3, p0, p5, p2, p7, 6);
-	Round512v30(p6, p1, p0, p7, p2, p5, p4, p3, 7);
-	p0 += ks[(R+1) % 9];   /* inject the key schedule value */
+
+	Round512v30(p0, p1, p2, p3, p4, p5, p6, p7, 39, 30, 34, 24);
+	Round512v30(p2, p1, p4, p7, p6, p5, p0, p3, 13, 50, 10, 17);
+	Round512v30(p4, p1, p6, p3, p0, p5, p2, p7, 25, 29, 39, 43);
+	Round512v30(p6, p1, p0, p7, p2, p5, p4, p3, 8,  35, 56, 22);
+
+	p0 += ks[(R+1) % 9];
 	p1 += ks[(R+2) % 9];
 	p2 += ks[(R+3) % 9];
 	p3 += ks[(R+4) % 9];
@@ -197,29 +200,28 @@ void Round_8_512v30(uint64_t *ks, uint64_t *ts, uint64_t &p0, uint64_t &p1, uint
 	p7 += ks[(R+8) % 9] + R+1;
 }
 
+#define skein_ks_parity64 0x1BD11BDAA9FC1A22ull
+#include <stdio.h>
 __global__  __launch_bounds__(256, 3)
 void skein256_gpu_hash_32_v30(uint32_t threads, uint32_t startNounce, uint64_t *outputHash)
 {
 	const uint32_t thread = (blockDim.x * blockIdx.x + threadIdx.x);
 	if (thread < threads)
 	{
-		uint64_t h[9], t[3];
-
-		h[8] = skein_ks_parity64;
-		for (int i = 0; i<8; i++) {
-			h[i] = SKEIN_IV512_256[i];
-			h[8] ^= h[i];
-		}
-
-		t[0] = devectorize(t12[0]);
-		t[1] = devectorize(t12[1]);
-		t[2] = devectorize(t12[2]);
-
+		uint64_t h[12] = { // SKEIN_IV512_256
+			0xCCD044A12FDB3E13, 0xE83590301A79A9EB,
+			0x55AEA0614F816E6F, 0x2A2767A4AE9B94DB,
+			0xEC06025E74DD7683, 0xE7A436CDC4746251,
+			0xC36FBAF9393AD185, 0x3EEDBA1833EDFC13,
+			0xb69d3cfcc73a4e2a, // skein_ks_parity64 ^ h[0..7]
+			0x20, 0xf000000000000000, 0xf000000000000020 // t0..2
+		};
 		uint64_t dt0 = outputHash[thread];
 		uint64_t dt1 = outputHash[threads   + thread];
 		uint64_t dt2 = outputHash[threads*2 + thread];
 		uint64_t dt3 = outputHash[threads*3 + thread];
 
+		uint64_t *t = &h[9];
 		uint64_t p0 = h[0] + dt0;
 		uint64_t p1 = h[1] + dt1;
 		uint64_t p2 = h[2] + dt2;
@@ -254,9 +256,9 @@ void skein256_gpu_hash_32_v30(uint32_t threads, uint32_t startNounce, uint64_t *
 			h[8] ^= h[i];
 		}
 
-		t[0] = devectorize(t12[3]);
-		t[1] = devectorize(t12[4]);
-		t[2] = devectorize(t12[5]);
+		t[0] = 0x08;
+		t[1] = 0xff00000000000000;
+		t[2] = 0xff00000000000008;
 
 		p5 += t[0];  //p5 already equal h[5]
 		p6 += t[1];
@@ -270,7 +272,6 @@ void skein256_gpu_hash_32_v30(uint32_t threads, uint32_t startNounce, uint64_t *
 		outputHash[threads   + thread] = p1;
 		outputHash[threads*2 + thread] = p2;
 		outputHash[threads*3 + thread] = p3;
-
 	} //thread
 }