diff --git a/compiler/heptagon/transformations/every_mapfold.ml b/compiler/heptagon/transformations/every_mapfold.ml
new file mode 100644
index 0000000..224f04a
--- /dev/null
+++ b/compiler/heptagon/transformations/every_mapfold.ml
@@ -0,0 +1,38 @@
+open Heptagon
+open Hept_mapfold
+open Reset
+
+let statefull eq_list = List.exists (fun eq -> eq.eq_statefull) eq_list
+
+let is_var = function
+  | { e_desc = Evar _ } -> true
+  | _ -> false
+
+let block funs acc b =
+  let b, (v, acc_eq_list) = Hept_mapfold.block funs ([], []) b in
+    { b with b_local = v @ b.b_local; b_equs = acc_eq_list }, acc
+
+let edesc funs (v,acc_eq_list) ed =
+  let ed, (v, acc_eq_list) = Hept_mapfold.edesc funs (v,acc_eq_list) ed in
+  match ed with
+    | Eapp (op, e_list, Some re) when not (is_var re) ->
+        let n, v, acc_eq_list = equation v acc_eq_list re in
+        let re = { re with e_desc = Evar n } in
+          Eapp(op, e_list, Some re), (v, acc_eq_list)
+
+    | Eiterator(it, op, n, e_list, Some re) when not (is_var re) ->
+        let x, v, acc_eq_list = equation v acc_eq_list re in
+        let re = { re with e_desc = Evar x } in
+          Eiterator(it, op, n, e_list, Some re), (v, acc_eq_list)
+
+    | _ -> ed, (v, acc_eq_list)
+
+let node funs _ n =
+  let n, (v, eq_list) = Hept_mapfold.node_dec funs ([],[]) n in
+    { n with n_local = v @ n.n_local; n_equs = eq_list @ n.n_equs; }, ([],[])
+
+let program p =
+  let funs = { Hept_mapfold.hept_funs_default with edesc = edesc; block = block;
+                 node_dec = node } in
+  let p, _ = program_it funs ([],[]) p in
+    p