diff --git a/examples/rime/example-broadcast-button.c b/examples/rime/example-broadcast-button.c
new file mode 100644
index 000000000..47224ad33
--- /dev/null
+++ b/examples/rime/example-broadcast-button.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2007, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * $Id: example-broadcast.c,v 1.3 2010/11/06 15:03:48 adamdunkels Exp $
+ */
+
+/**
+ * \file
+ *         Testing the broadcast layer in Rime
+ * \author
+ *         Adam Dunkels <adam@sics.se>
+ */
+
+#include "contiki.h"
+#include "net/rime.h"
+#include "random.h"
+
+#include "dev/button-sensor.h"
+
+#include "dev/leds.h"
+
+#include <stdio.h>
+/*---------------------------------------------------------------------------*/
+PROCESS(example_broadcast_process, "Broadcast example");
+AUTOSTART_PROCESSES(&example_broadcast_process);
+/*---------------------------------------------------------------------------*/
+static void
+broadcast_recv(struct broadcast_conn *c, const rimeaddr_t *from)
+{
+  printf("broadcast message received from %d.%d: '%s'\n",
+         from->u8[0], from->u8[1], (char *)packetbuf_dataptr());
+}
+static const struct broadcast_callbacks broadcast_call = {broadcast_recv};
+static struct broadcast_conn broadcast;
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(example_broadcast_process, ev, data)
+{
+  static struct etimer et;
+
+  PROCESS_EXITHANDLER(broadcast_close(&broadcast);)
+
+  PROCESS_BEGIN();
+
+  SENSORS_ACTIVATE(button_sensor);
+  broadcast_open(&broadcast, 129, &broadcast_call);
+
+  while(1) {
+
+    /* Delay 2-4 seconds */
+    //etimer_set(&et, CLOCK_SECOND * 4 + random_rand() % (CLOCK_SECOND * 4));
+    etimer_set(&et, CLOCK_SECOND);
+
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et) || (ev == sensors_event &&
+                             data == &button_sensor));
+
+    packetbuf_copyfrom("Hello", 6);
+    broadcast_send(&broadcast);
+    printf("broadcast message sent\n");
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+
diff --git a/platform/z1/contiki-conf.h b/platform/z1/contiki-conf.h
index c09b44635..65534cdf6 100644
--- a/platform/z1/contiki-conf.h
+++ b/platform/z1/contiki-conf.h
@@ -54,7 +54,9 @@
 #define CXMAC_CONF_ANNOUNCEMENTS         0
 #define XMAC_CONF_ANNOUNCEMENTS          0
 
-#define QUEUEBUF_CONF_NUM                4
+//Enric #define QUEUEBUF_CONF_NUM                4
+#define QUEUEBUF_CONF_NUM                8 //Enric like in SKY
+
 
 #else /* WITH_UIP6 */
 
@@ -63,7 +65,9 @@
 #define NETSTACK_CONF_NETWORK rime_driver
 #define NETSTACK_CONF_MAC     csma_driver
 /* #define NETSTACK_CONF_RDC     contikimac_driver */
-#define NETSTACK_CONF_RDC     nullrdc_driver
+ #define NETSTACK_CONF_RDC     contikimac_driver 
+//#define NETSTACK_CONF_RDC     nullrdc_driver
+#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8 //Enric like in SKY
 #define NETSTACK_CONF_FRAMER  framer_802154
 
 #define CC2420_CONF_AUTOACK              0
diff --git a/platform/z1/dev/cc2420-arch.c b/platform/z1/dev/cc2420-arch.c
index 1588131a1..ca72686b8 100644
--- a/platform/z1/dev/cc2420-arch.c
+++ b/platform/z1/dev/cc2420-arch.c
@@ -47,7 +47,7 @@
 #endif
 
 /*---------------------------------------------------------------------------*/
-#if 0
+#if 1
 // this is now handled in the ADXL345 accelerometer code as it uses irq on port1 too.
 interrupt(CC2420_IRQ_VECTOR)
 cc24240_port1_interrupt(void)
diff --git a/tools/sky/serial/__init__.pyc b/tools/sky/serial/__init__.pyc
deleted file mode 100644
index e81d9f74e..000000000
Binary files a/tools/sky/serial/__init__.pyc and /dev/null differ
diff --git a/tools/sky/serial/serialposix.pyc b/tools/sky/serial/serialposix.pyc
deleted file mode 100644
index ba8d505b0..000000000
Binary files a/tools/sky/serial/serialposix.pyc and /dev/null differ
diff --git a/tools/sky/serial/serialutil.pyc b/tools/sky/serial/serialutil.pyc
deleted file mode 100644
index 1ded9ffd8..000000000
Binary files a/tools/sky/serial/serialutil.pyc and /dev/null differ