diff --git a/grc/demapping/gsm_bcch_ccch_demapper.xml b/grc/demapping/gsm_bcch_ccch_demapper.xml
index b295ce1..ff392f1 100644
--- a/grc/demapping/gsm_bcch_ccch_demapper.xml
+++ b/grc/demapping/gsm_bcch_ccch_demapper.xml
@@ -1,61 +1,30 @@
-<?xml version="1.0"?>
 <block>
   <name>BCCH + CCCH demapper</name>
   <key>gsm_bcch_ccch_demapper</key>
+  <category></category>
   <import>import grgsm</import>
-  <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $downlink_starts_fn_mod51, $downlink_channel_types, $uplink_starts_fn_mod51, $uplink_channel_types)</make>
-
+  <make>grgsm.gsm_bcch_ccch_demapper(
+    timeslot_nr=$timeslot_nr,
+)</make>
+  <callback>set_timeslot_nr($timeslot_nr)</callback>
   <param>
-    <name>Timeslot</name>
+    <name>timeslot_nr</name>
     <key>timeslot_nr</key>
     <value>0</value>
-    <type>int</type>
-    <hide>none</hide>
+    <type>raw</type>
   </param>
-
-  <param>
-    <name>downlink_starts_fn_mod51</name>
-    <key>downlink_starts_fn_mod51</key>
-    <value>[2,6,12,16,22,26,32,36,42,46]</value>
-    <type>int_vector</type>
-    <hide>all</hide>
-  </param>
-
-  <param>
-    <name>downlink_channel_types</name>
-    <key>downlink_channel_types</key>
-    <value>[1,2,2,2,2,2,2,2,2,2]</value>
-    <type>int_vector</type>
-    <hide>all</hide>
-  </param>
-
-  <param>
-    <name>uplink_starts_fn_mod51</name>
-    <key>uplink_starts_fn_mod51</key>
-    <value>[]</value>
-    <type>int_vector</type>
-    <hide>all</hide>
-  </param>
-
-  <param>
-    <name>uplink_channel_types</name>
-    <key>uplink_channel_types</key>
-    <value>[]</value>
-    <type>int_vector</type>
-    <hide>all</hide>
-  </param>
-
   <sink>
     <name>bursts</name>
     <type>message</type>
+    <optional>1</optional>
   </sink>
   <source>
     <name>bursts</name>
     <type>message</type>
+    <optional>1</optional>
   </source>
-  
-  <doc>
-      Demapper for BCCH + CCCH control channels.
-      This corresponds to channel combination iv specified in GSM 05.02, section 6.4
-  </doc>
-</block> 
+  <doc>Piotr Krysik
+Demapper for BCCH + CCCH control channels. This corresponds to channel combination iv specified in GSM 05.02, section 6.4
+</doc>
+  <grc_source>gr-gsm/hier_blocks/demapping/gsm_bcch_ccch_demapper.grc</grc_source>
+</block>