diff --git a/lib/middleware-common/Cargo.toml b/lib/middleware-common/Cargo.toml
index 57a42577c..2beabfb6b 100644
--- a/lib/middleware-common/Cargo.toml
+++ b/lib/middleware-common/Cargo.toml
@@ -8,4 +8,4 @@ authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
 edition = "2018"
 
 [dependencies]
-wasmer-runtime-core = { path = "../runtime-core", version = "0.4.1" }
+wasmer-runtime-core = { path = "../runtime-core" }
diff --git a/lib/middleware-common/src/lib.rs b/lib/middleware-common/src/lib.rs
index e09d9ee03..41699c9e7 100644
--- a/lib/middleware-common/src/lib.rs
+++ b/lib/middleware-common/src/lib.rs
@@ -1,3 +1,4 @@
 #![deny(unused_imports, unused_variables, unused_unsafe, unreachable_patterns)]
 
 pub mod call_trace;
+pub mod metering;
diff --git a/lib/middleware-common/src/metering.rs b/lib/middleware-common/src/metering.rs
new file mode 100644
index 000000000..5d19eef35
--- /dev/null
+++ b/lib/middleware-common/src/metering.rs
@@ -0,0 +1,83 @@
+use wasmer_runtime_core::{
+    codegen::{Event, EventSink, FunctionMiddleware, InternalEvent},
+    module::ModuleInfo,
+    wasmparser::{Operator, Type as WpType},
+};
+
+pub struct Metering {
+    limit: u64,
+    current_block: u64,
+}
+
+impl Metering {
+    pub fn new(limit: u64) -> Metering {
+        Metering {
+            limit,
+            current_block: 0,
+        }
+    }
+}
+
+impl FunctionMiddleware for Metering {
+    type Error = String;
+    fn feed_event<'a, 'b: 'a>(
+        &mut self,
+        op: Event<'a, 'b>,
+        _module_info: &ModuleInfo,
+        sink: &mut EventSink<'a, 'b>,
+    ) -> Result<(), Self::Error> {
+        match op {
+            Event::Internal(InternalEvent::FunctionBegin(_)) => {
+                self.current_block = 0;
+            }, 
+            Event::Wasm(&ref op) | Event::WasmOwned(ref op) => {
+                self.current_block += 1;
+                match *op {
+                    Operator::Loop { .. }
+                        | Operator::Block { .. }
+                        | Operator::End
+                        | Operator::If { .. }
+                        | Operator::Else
+                        | Operator::Unreachable
+                        | Operator::Br { .. }
+                        | Operator::BrTable { .. }
+                        | Operator::BrIf { .. }
+                        | Operator::Call { .. }
+                        | Operator::CallIndirect { .. }
+                        => {
+                            sink.push(Event::Internal(InternalEvent::GetInternal(0)));
+                            sink.push(Event::WasmOwned(Operator::I64Const { value: self.current_block as i64 }));
+                            sink.push(Event::WasmOwned(Operator::I64Add));
+                            sink.push(Event::Internal(InternalEvent::SetInternal(0)));
+                            self.current_block = 0;
+                    },
+                    _ => {}
+                }
+                match *op {
+                        Operator::Br { .. }
+                        | Operator::BrTable { .. }
+                        | Operator::BrIf { .. }
+                        | Operator::Call { .. }
+                        | Operator::CallIndirect { .. }
+                        => {
+                            sink.push(Event::Internal(InternalEvent::GetInternal(0)));
+                            sink.push(Event::WasmOwned(Operator::I64Const { value: self.limit as i64 }));
+                            sink.push(Event::WasmOwned(Operator::I64GeU));
+                            sink.push(Event::WasmOwned(Operator::If { ty: WpType::EmptyBlockType }));
+                            sink.push(Event::Internal(InternalEvent::Breakpoint(Box::new(move |ctx| {
+                                eprintln!("execution limit reached");
+                                unsafe {
+                                    (ctx.throw)();
+                                }
+                            }))));
+                            sink.push(Event::WasmOwned(Operator::End));
+                    },
+                    _ => {}
+                }
+            },
+            _ => {}
+        }
+        sink.push(op);
+        Ok(())
+    }
+}