diff --git a/arch/x86/scc/icc.c b/arch/x86/scc/icc.c
index 3fa97c7e..2325896e 100644
--- a/arch/x86/scc/icc.c
+++ b/arch/x86/scc/icc.c
@@ -229,11 +229,11 @@ int icc_halt(void)
 int icc_send_gic_irq(int core_num) {
 	volatile uint64_t* irq_request = (volatile uint64_t*)(FPGA_BASE+IRQ_REQUEST+my_ue*8);
 	uint64_t bit_pos;
-
+	
 	// determine bit position and set according bit
 	bit_pos = (1 << core_num);
 	*irq_request = bit_pos;	
-
+	
 	return 0;
 }
 
@@ -365,7 +365,6 @@ int icc_mail_ping_irq( void )
 	
 	// disable interrupts
 	flags = irq_nested_disable();
-	
 	for( i=0; i<ROUNDS+1; ++i ) {
 		/* send ping request */ 
 		iRCCE_mail_send(0, PING_REQ, 0, NULL, rem_rank);
@@ -384,6 +383,7 @@ int icc_mail_ping_irq( void )
 			res = iRCCE_mail_recv(&recv_header);
 		} while( (recv_header->source != rem_rank) 
 				&& (recv_header->tag == PING_RESP) );
+
 		iRCCE_mail_release(&recv_header);
 
 		/* start timer in first round */
@@ -419,8 +419,8 @@ int icc_mail_noise() {
 	for( ;; ) {
 		/* send a mail to each UE */
 		for( j=0; j<num_ranks; ++j ) {
-		//	if( (j == CORE_A) || (j == CORE_B) ) 
-		//		continue;
+			if( (j == CORE_A) /*|| (j == CORE_B)*/ ) 
+				continue;
 	
 			/* recv mails */
 			iRCCE_mail_check(iRCCE_MAILBOX_ALL);