diff --git a/src/GRHD/GRHD.jl b/src/GRHD/GRHD.jl
index 96385f4f48c85b90ab55d57a465e00b9f7886001..a49779c3dcd5d239042291bf797f7d46223c17b6 100644
--- a/src/GRHD/GRHD.jl
+++ b/src/GRHD/GRHD.jl
@@ -6,6 +6,7 @@ using dg1d
 using Roots
 using LinearAlgebra
 using LoopVectorization
+using Polyester
 using BasicInterpolators
 
 
diff --git a/src/GRHD/cons2prim.jl b/src/GRHD/cons2prim.jl
index df26a99bc7f586db5c8ca38dc8b7790dc52fb4fd..963f0f185701f2a77670e987e052f4c86d41e91e 100644
--- a/src/GRHD/cons2prim.jl
+++ b/src/GRHD/cons2prim.jl
@@ -3,7 +3,7 @@
 #######################################################################
 
 
-@with_signature [simd=false] function cons2prim_valencia1d_freeze_flags(eq::AbstractEquation)
+@with_signature [polyester=true] function cons2prim_valencia1d_freeze_flags(eq::AbstractEquation)
   @accepts D, Sr, Ï„, r
   @accepts c2p_reset_atm, c2p_limit_vr, c2p_freeze_atm
   @accepts γrr, sqrt_detγ
@@ -14,7 +14,7 @@
   rτ  = sqrt_detγ*τ
   @returns D, Sr, τ, rD, rSr, rτ, ρ, vr, v, ϵ, p, ρhW2, c2p_reset_ϵ, c2p_reset_atm, c2p_limit_vr, c2p_init_admissible
 end
-@with_signature [simd=false] function cons2prim_valencia1d(eq::AbstractEquation)
+@with_signature [polyester=true] function cons2prim_valencia1d(eq::AbstractEquation)
   @accepts D, Sr, Ï„, r
   @accepts c2p_reset_atm, c2p_limit_vr, c2p_freeze_atm
   @accepts γrr, sqrt_detγ
@@ -27,7 +27,7 @@ end
 end
 
 
-@with_signature [simd=false] function cons2prim_spherical1d_freeze_flags(eq::AbstractEquation)
+@with_signature [polyester=true] function cons2prim_spherical1d_freeze_flags(eq::AbstractEquation)
   @accepts D, Sr, Ï„, r
   @accepts c2p_reset_atm, c2p_limit_vr, c2p_freeze_atm
   @accepts γrr
@@ -36,7 +36,7 @@ end
   @returns D, Sr, τ, ρ, vr, v, ϵ, p, ρhW2, c2p_reset_ϵ, c2p_reset_atm, c2p_limit_vr, c2p_init_admissible
 end
 
-@with_signature [simd=false] function cons2prim_spherical1d(eq::AbstractEquation)
+@with_signature [polyester=true] function cons2prim_spherical1d(eq::AbstractEquation)
   @accepts D, Sr, Ï„, r
   @accepts c2p_reset_atm, c2p_limit_vr, c2p_freeze_atm
   @accepts γrr
@@ -46,7 +46,7 @@ end
 end
 
 
-@with_signature [simd=false] function cons2prim_rescaled_spherical1d_freeze_flags(eq::AbstractEquation)
+@with_signature [polyester=true] function cons2prim_rescaled_spherical1d_freeze_flags(eq::AbstractEquation)
   @accepts D, Sr, Ï„, r
   @accepts c2p_reset_atm, c2p_limit_vr, c2p_freeze_atm
   @accepts γrr, B
@@ -58,7 +58,7 @@ end
   rτ  = r*B^3*τ
   @returns D, Sr, τ, rD, rSr, rτ, ρ, vr, v, ϵ, p, ρhW2, c2p_reset_ϵ, c2p_reset_atm, c2p_limit_vr, c2p_init_admissible
 end
-@with_signature [simd=false] function cons2prim_rescaled_spherical1d(eq::AbstractEquation)
+@with_signature [polyester=true] function cons2prim_rescaled_spherical1d(eq::AbstractEquation)
   @accepts D, Sr, Ï„, r
   @accepts c2p_reset_atm, c2p_limit_vr, c2p_freeze_atm
   @accepts γrr, B
@@ -72,7 +72,7 @@ end
 end
 
 
-@with_signature [simd=false] function cons2prim_doublecartoon_freeze_flags(eq::AbstractEquation)
+@with_signature [polyester=true] function cons2prim_doublecartoon_freeze_flags(eq::AbstractEquation)
   @accepts D, Sx, Ï„, r
   @accepts c2p_reset_atm, c2p_limit_vr, c2p_freeze_atm
   @accepts γxx, sqrtdetγ
@@ -84,7 +84,7 @@ end
   rτ  = sqrtdetγ*τ
   @returns D, Sx, τ, rD, rSx, rτ, ρ, vx, v, ϵ, p, ρhW2, c2p_reset_ϵ, c2p_reset_atm, c2p_limit_vr, c2p_init_admissible
 end
-@with_signature [simd=false] function cons2prim_doublecartoon(eq::AbstractEquation)
+@with_signature [polyester=true] function cons2prim_doublecartoon(eq::AbstractEquation)
   @accepts D, Sx, Ï„, r
   @accepts c2p_reset_atm, c2p_limit_vr, c2p_freeze_atm
   @accepts γxx, sqrtdetγ
@@ -98,7 +98,7 @@ end
 end
 
 
-@with_signature [simd=false] function cons2prim_cartoon_freeze_flags(eq::AbstractEquation)
+@with_signature [polyester=true] function cons2prim_cartoon_freeze_flags(eq::AbstractEquation)
   @accepts D, Sx, Sz, Ï„, x, y
   @accepts c2p_reset_atm, c2p_limit_vr, c2p_freeze_atm
   @accepts γxx, γzz, sqrtdetγ
@@ -112,7 +112,7 @@ end
   rτ  = sqrtdetγ*τ
   @returns D, Sx, Sz, τ, rD, rSx, rSz, rτ, ρ, vx, vz, v, ϵ, p, ρhW2, c2p_reset_ϵ, c2p_reset_atm, c2p_limit_vr, c2p_init_admissible
 end
-@with_signature [simd=false] function cons2prim_cartoon(eq::AbstractEquation)
+@with_signature [polyester=true] function cons2prim_cartoon(eq::AbstractEquation)
   @accepts D, Sx, Sz, Ï„, x, y
   @accepts c2p_reset_atm, c2p_limit_vr, c2p_freeze_atm
   @accepts γxx, γzz, sqrtdetγ