diff --git a/trial3/layer1.c b/trial3/layer1.c
index 5fd4c78..16bc9be 100644
--- a/trial3/layer1.c
+++ b/trial3/layer1.c
@@ -250,11 +250,8 @@ int seedRNGSource(void *data, unsigned char *output, size_t len)
   if(memcpy(output, p_ent -> accumulator.buffer + ACCUM_BUFF_OFFSET , ENTROPY_LEN) < 0)
   	return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
 
-  for(int i = 0; i < ENTROPY_LEN; i++)
-      printf("0x%hhx,",output[i]);
-  printf(" :  CDIKEY\n");
   len = ENTROPY_LEN;
-  printf("%d\n", (int)len );
+
 
   return 0;
 
@@ -280,108 +277,105 @@ int deriveECCKeyPair(KeyDrv_context * KD_ctx)
 	printf("inside deriveECCKeyPair layer1\n\n");
 
 	int ret = 0;
-    unsigned char pubkeybuf[100];
-    size_t pubkeysize;
-    char privkeybuf[100];
-    size_t privkeysize;
-    char privkeybuf2[100];
-    size_t privkey2size;
+  unsigned char pubkeybuf[100];
+  size_t pubkeysize;
+  char privkeybuf[100];
+  size_t privkeysize;
+  char privkeybuf2[100];
+  size_t privkey2size;
 
 
+  mbedtls_ecp_group ecpGrp;
+  mbedtls_ecp_group_init(&ecpGrp);
+  mbedtls_ecp_group_load(&ecpGrp, ECC_CURVE);
 
+  mbedtls_mpi secret;
+  mbedtls_mpi_init(&secret);
 
-	mbedtls_ecp_group ecpGrp;
-    mbedtls_ecp_group_init(&ecpGrp);
-    mbedtls_ecp_group_load(&ecpGrp, ECC_CURVE);
+  mbedtls_ecp_point Public;
+  mbedtls_ecp_point_init(&Public);
 
-    mbedtls_mpi secret;
-    mbedtls_mpi_init(&secret);
+  mbedtls_entropy_context entropyCtx;
+  mbedtls_entropy_init(&entropyCtx);
 
-    mbedtls_ecp_point Public;
-    mbedtls_ecp_point_init(&Public);
+  mbedtls_ctr_drbg_context drbgCtx;
+  mbedtls_ctr_drbg_init(&drbgCtx);
 
-    mbedtls_entropy_context entropyCtx;
-    mbedtls_entropy_init(&entropyCtx);
+ 
+  if (KD_ctx->ENT_MODE == HW_TRNG)		//HW RNG
+  {
+  	printf("using /dev/random.... this may take a moment\n");
+  	mbedtls_entropy_add_source( &entropyCtx, use_dev_random,
+                               NULL, ENTROPY_LEN, MBEDTLS_ENTROPY_SOURCE_STRONG );
+  	
+  	mbedtls_ctr_drbg_seed(&drbgCtx, mbedtls_entropy_func,
+                             &entropyCtx,
+                             (const unsigned char *) KD_ctx->phrase ,
+                             strlen(KD_ctx->phrase)
+                             );
+  }
 
-    mbedtls_ctr_drbg_context drbgCtx;
-    mbedtls_ctr_drbg_init(&drbgCtx);
-
-   
-    if (KD_ctx->ENT_MODE == HW_TRNG)		//HW RNG
+  else if (KD_ctx->ENT_MODE == DETERM)			// Deterministic derviation with seed
+  {	
+  	printf("Seeding entropy accumulator....\n");
+    if(mbedtls_entropy_update_manual(&entropyCtx, KD_ctx->seed, ENTROPY_LEN) < 0)
     {
-    	printf("using /dev/random.... this may take a moment\n");
-    	mbedtls_entropy_add_source( &entropyCtx, use_dev_random,
-                                 NULL, ENTROPY_LEN, MBEDTLS_ENTROPY_SOURCE_STRONG );
-    	
-    	mbedtls_ctr_drbg_seed(&drbgCtx, mbedtls_entropy_func,
-                               &entropyCtx,
-                               (const unsigned char *) KD_ctx->phrase ,
-                               strlen(KD_ctx->phrase)
-                               );
+    	perror("Accumulator seed failed\n");
+    	return RIOTFAILURE;
     }
 
-    else if (KD_ctx->ENT_MODE == DETERM)			// Deterministic derviation with seed
-    {	
-    	printf("Seeding entropy accumulator....\n");
-	    if(mbedtls_entropy_update_manual(&entropyCtx, KD_ctx->seed, ENTROPY_LEN) < 0)
-	    {
-	    	perror("Accumulator seed failed\n");
-	    	return RIOTFAILURE;
-	    }
-
-	    if(mbedtls_ctr_drbg_seed(&drbgCtx, seedRNGSource, &entropyCtx,
-	    				(const unsigned char *) KD_ctx->phrase, sizeof(&KD_ctx->phrase)) < 0)
-	    {
-	    	perror("drbg seed failed\v");
-	    	return RIOTFAILURE;
-	    }
+    if(mbedtls_ctr_drbg_seed(&drbgCtx, seedRNGSource, &entropyCtx,
+    				(const unsigned char *) KD_ctx->phrase, sizeof(&KD_ctx->phrase)) < 0)
+    {
+    	perror("drbg seed failed\v");
+    	return RIOTFAILURE;
+    }
 	}
 
-	else 						//regular key derivation
+	else 						//regular SW accumulator used for key derivation
 	{
 		printf("Accumulating entropy ...\n");
 		mbedtls_entropy_update_manual(&entropyCtx, KD_ctx->seed, ENTROPY_LEN);
-		mbedtls_ctr_drbg_seed(&drbgCtx, mbedtls_entropy_func,
-                               &entropyCtx,
+		mbedtls_ctr_drbg_seed(&drbgCtx, mbedtls_entropy_func, &entropyCtx,
                                (const unsigned char *) KD_ctx->phrase ,
                                strlen(KD_ctx->phrase)
                                );
 	}
 
-    if(mbedtls_ecp_gen_keypair(&ecpGrp, &secret, &Public, 
-    				mbedtls_ctr_drbg_random, &drbgCtx) <0)
-    {
-    	perror("ECP gen keypair failed\n");
-    	return RIOTFAILURE;
-    }
+  if(mbedtls_ecp_gen_keypair(&ecpGrp, &secret, &Public, 
+  				mbedtls_ctr_drbg_random, &drbgCtx) <0)
+  {
+  	perror("ECP gen keypair failed\n");
+  	return RIOTFAILURE;
+  }
 
-	ret = mbedtls_ecp_tls_write_point(&ecpGrp, &Public, MBEDTLS_ECP_PF_UNCOMPRESSED,
-     				&pubkeysize, pubkeybuf, sizeof(pubkeybuf));
-    if(ret < 0)
-    {
-    	perror("ECP write point failure\n");
-    	return RIOTFAILURE;
-    }
+  ret = mbedtls_ecp_tls_write_point(&ecpGrp, &Public, MBEDTLS_ECP_PF_UNCOMPRESSED,
+   				&pubkeysize, pubkeybuf, sizeof(pubkeybuf));
+  if(ret < 0)
+  {
+  	perror("ECP write point failure\n");
+  	return RIOTFAILURE;
+  }
 
-  	//printf("%zu : pubkeysize\n", pubkeysize );
+	//printf("%zu : pubkeysize\n", pubkeysize );
 	for(int i = 0; i < pubkeysize; i++)
 		printf("%hhx",pubkeybuf[i]);
 	printf(" :  PubKey\n");
 
 
-    ret = mbedtls_mpi_write_string(&secret, 16, privkeybuf, sizeof(privkeybuf), &privkeysize);
-    if(ret < 0)
-    {
-    	printf("%d\n", ret);
-    	perror("MPI write point to string failure\n");
-    	return RIOTFAILURE;
-    }
+  ret = mbedtls_mpi_write_string(&secret, 16, privkeybuf, sizeof(privkeybuf), &privkeysize);
+  if(ret < 0)
+  {
+  	printf("%d\n", ret);
+  	perror("MPI write point to string failure\n");
+  	return RIOTFAILURE;
+  }
 
 	printf("%s :  PrivKey\n",privkeybuf);
 
 	//copy keys to parent function
-    mbedtls_ecp_copy(&KD_ctx->Public, &Public);
-    mbedtls_mpi_copy(&KD_ctx->secret, &secret);		/* Make SK NULL for Identitiy key generation */
+  mbedtls_ecp_copy(&KD_ctx->Public, &Public);
+  mbedtls_mpi_copy(&KD_ctx->secret, &secret);		/* Make SK NULL for Identitiy key generation */
 
 
 
diff --git a/trial3/layer2.c b/trial3/layer2.c
index 1a379d1..7ac4b12 100644
--- a/trial3/layer2.c
+++ b/trial3/layer2.c
@@ -19,7 +19,7 @@ void ROMprotocol(void)
 
 
   deriveDeviceIDKeyPair(CDIKEY, USE_ECC);
-  deriveDeviceIDKeyPair(CDIKEY, USE_ECC);
+  //deriveDeviceIDKeyPair(CDIKEY, USE_ECC);
 
 
 printf("pass 100\n");
diff --git a/trial3/nbproject/private/configurations.xml b/trial3/nbproject/private/configurations.xml
index 4eb20b6..7534ff3 100644
--- a/trial3/nbproject/private/configurations.xml
+++ b/trial3/nbproject/private/configurations.xml
@@ -3,6 +3,86 @@
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="." name="0">
       <df name="include">
+        <df name="mbedtls">
+          <in>aes.h</in>
+          <in>aesni.h</in>
+          <in>arc4.h</in>
+          <in>aria.h</in>
+          <in>asn1.h</in>
+          <in>asn1write.h</in>
+          <in>base64.h</in>
+          <in>bignum.h</in>
+          <in>blowfish.h</in>
+          <in>bn_mul.h</in>
+          <in>camellia.h</in>
+          <in>ccm.h</in>
+          <in>certs.h</in>
+          <in>chacha20.h</in>
+          <in>chachapoly.h</in>
+          <in>check_config.h</in>
+          <in>cipher.h</in>
+          <in>cipher_internal.h</in>
+          <in>cmac.h</in>
+          <in>compat-1.3.h</in>
+          <in>config.h</in>
+          <in>ctr_drbg.h</in>
+          <in>debug.h</in>
+          <in>des.h</in>
+          <in>dhm.h</in>
+          <in>ecdh.h</in>
+          <in>ecdsa.h</in>
+          <in>ecjpake.h</in>
+          <in>ecp.h</in>
+          <in>ecp_internal.h</in>
+          <in>entropy.h</in>
+          <in>entropy_poll.h</in>
+          <in>error.h</in>
+          <in>gcm.h</in>
+          <in>havege.h</in>
+          <in>hkdf.h</in>
+          <in>hmac_drbg.h</in>
+          <in>md.h</in>
+          <in>md2.h</in>
+          <in>md4.h</in>
+          <in>md5.h</in>
+          <in>md_internal.h</in>
+          <in>memory_buffer_alloc.h</in>
+          <in>net.h</in>
+          <in>net_sockets.h</in>
+          <in>nist_kw.h</in>
+          <in>oid.h</in>
+          <in>padlock.h</in>
+          <in>pem.h</in>
+          <in>pk.h</in>
+          <in>pk_internal.h</in>
+          <in>pkcs11.h</in>
+          <in>pkcs12.h</in>
+          <in>pkcs5.h</in>
+          <in>platform.h</in>
+          <in>platform_time.h</in>
+          <in>platform_util.h</in>
+          <in>poly1305.h</in>
+          <in>ripemd160.h</in>
+          <in>rsa.h</in>
+          <in>rsa_internal.h</in>
+          <in>sha1.h</in>
+          <in>sha256.h</in>
+          <in>sha512.h</in>
+          <in>ssl.h</in>
+          <in>ssl_cache.h</in>
+          <in>ssl_ciphersuites.h</in>
+          <in>ssl_cookie.h</in>
+          <in>ssl_internal.h</in>
+          <in>ssl_ticket.h</in>
+          <in>threading.h</in>
+          <in>timing.h</in>
+          <in>version.h</in>
+          <in>x509.h</in>
+          <in>x509_crl.h</in>
+          <in>x509_crt.h</in>
+          <in>x509_csr.h</in>
+          <in>xtea.h</in>
+        </df>
       </df>
       <df name="keys">
       </df>
@@ -42,8 +122,6 @@
         <gdb_interceptlist>
           <gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
         </gdb_interceptlist>
-        <gdb_signals>
-        </gdb_signals>
         <gdb_options>
           <DebugOptions>
           </DebugOptions>
diff --git a/trial3/out/main b/trial3/out/main
index 553fea7..9171901 100755
Binary files a/trial3/out/main and b/trial3/out/main differ