diff --git a/netpfga/bind-mount.sh b/netpfga/bind-mount.sh
index 6f49c53..36f7fd5 100755
--- a/netpfga/bind-mount.sh
+++ b/netpfga/bind-mount.sh
@@ -2,8 +2,6 @@
 
 set -x
 
-mkdir -p ~/projects/P4-NetFPGA/contrib-projects/sume-sdnet-switch/projects/minip4/
-
 # Remove possible symlinks
 rm -f ~/projects/P4-NetFPGA/contrib-projects/sume-sdnet-switch/projects/minip4/src
 rm -f ~/projects/P4-NetFPGA/contrib-projects/sume-sdnet-switch/projects/minip4
diff --git a/netpfga/do-all-steps.sh b/netpfga/do-all-steps.sh
index b3268c8..095743b 100755
--- a/netpfga/do-all-steps.sh
+++ b/netpfga/do-all-steps.sh
@@ -6,7 +6,12 @@ set -x
 echo "First source all variables and THEN run this script"
 read something
 
-LOG=~/master-thesis/netpfga/log/compile-$(date +%F-%H%M%S)
+SUFFIX=""
+if [ $# -ge 1 ]; then
+    SUFFIX="-$1"
+fi
+
+LOG=~/master-thesis/netpfga/log/compile-$(date +%F-%H%M%S)$SUFFIX
 
 (
 
diff --git a/p4src/minip4_solution.p4 b/p4src/minip4_solution.p4
index e9af07f..87f1879 100644
--- a/p4src/minip4_solution.p4
+++ b/p4src/minip4_solution.p4
@@ -50,13 +50,14 @@ struct digest_data_t {
 @Xilinx_MaxPacketRegion(1024)
 parser TopParser(packet_in packet,
                  out headers hdr,
-//                 out metadata meta,
-                 out user_metadata_t user_metadata,
+                 out metadata meta,
+//                 out user_metadata_t user_metadata,
                  out digest_data_t digest_data,
                  inout sume_metadata_t standard_metadata) {
     state start {
         packet.extract(hdr.ethernet);
-        user_metadata.unused = 0;
+        //user_metadata.unused = 0;
+        meta.task = 0; // all others missing
         digest_data.unused = 0;
 
         transition accept;
@@ -77,8 +78,8 @@ parser TopParser(packet_in packet,
 //                 inout sume_metadata_t sume_metadata) {
 
 control TopPipe(inout headers hdr,
-        //inout metadata meta,
-        inout user_metadata_t user_metadata,
+        inout metadata meta,
+        //inout user_metadata_t user_metadata,
         inout digest_data_t digest_data,
         inout sume_metadata_t sume_metadata) {
 
@@ -244,8 +245,8 @@ control TopPipe(inout headers hdr,
 @Xilinx_MaxPacketRegion(1024)
 control TopDeparser(packet_out packet,
         in headers hdr,
-        in user_metadata_t user_metadata,
-//        in metadata meta,
+        //in user_metadata_t user_metadata,
+        in metadata meta,
         inout digest_data_t digest_data,
         inout sume_metadata_t sume_metadata) {