diff --git a/include/lustrec_math.lusi b/include/lustrec_math.lusi
index 5e8d79c43be7ad6d03983c4202f0cc5000ff339f..aef61c940e3c3a7c36ef194a5ae229e50fb9d33c 100644
--- a/include/lustrec_math.lusi
+++ b/include/lustrec_math.lusi
@@ -10,13 +10,17 @@ function cos (x: real) returns (y: real) prototype C lib m;
 function cosh (x: real) returns (y: real) prototype C lib m;
 function ceil (x: real) returns (y: real) prototype C lib m;
 function erf (x: real) returns (y: real) prototype C lib m;
+function exp (x: real) returns (y: real) prototype C lib m;
 function fabs (x: real) returns (y: real) prototype C lib m;
 function floor (x: real) returns (y: real) prototype C lib m;
-function tan (x: real) returns (y: real) prototype C lib m;
+function fmod (x,y: real) returns (z: real) prototype C lib m;
+function log (x: real) returns (y: real) prototype C lib m;
+function log10 (x: real) returns (y: real) prototype C lib m;
 function pow (x:real; n: real) returns (y: real) prototype C lib m;
 function round (x: real) returns (y: real) prototype C lib m;
 function sin (x: real) returns (y: real) prototype C lib m;
 function sinh (x: real) returns (y: real) prototype C lib m;
 function sqrt (x: real) returns (y: real) prototype C lib m;
 function trunc (x: real) returns (y: real) prototype C lib m;
+function tan (x: real) returns (y: real) prototype C lib m;
 
diff --git a/include/lustrec_math.smt2 b/include/lustrec_math.smt2
index 10bea00ef35867926f6f2c463a1f2bdcf20d87d6..91c3a4dea48843f327df5130f3f290b867e1cfca 100644
--- a/include/lustrec_math.smt2
+++ b/include/lustrec_math.smt2
@@ -1,6 +1,25 @@
-(declare-rel  cbrt (Real Real))
-(declare-rel  ceil (Real Real))
-(declare-rel  erf (Real Real))
-(declare-rel  fabs (Real Real))
-(declare-rel  pow (Real Real Real))
-(declare-rel  sqrt (Real Real))
+(declare-rel acos ( Real Real) )
+(declare-rel acosh ( Real Real) )
+(declare-rel asin ( Real Real) )
+(declare-rel asinh ( Real Real) )
+(declare-rel atan ( Real Real) )
+(declare-rel atan2(Real Real Real) )
+(declare-rel atanh ( Real Real) )
+(declare-rel cbrt ( Real Real) )
+(declare-rel cos ( Real Real) )
+(declare-rel cosh ( Real Real) )
+(declare-rel ceil ( Real Real) )
+(declare-rel erf ( Real Real) )
+(declare-rel fabs ( Real Real) )
+(declare-rel floor ( Real Real) )
+(declare-rel fmod (Real Real Real) )
+(declare-rel tan ( Real Real) )
+(declare-rel pow (Real Real Real) )
+(declare-rel round ( Real Real) )
+(declare-rel sin ( Real Real) )
+(declare-rel sinh ( Real Real) )
+(declare-rel sqrt ( Real Real) )
+(declare-rel trunc ( Real Real) )
+(declare-rel exp ( Real Real) )
+(declare-rel log ( Real Real) )
+(declare-rel log10 ( Real Real) )
diff --git a/include/simulink_math_fcn.c b/include/simulink_math_fcn.c
index 84b3354f2f14b8e65c079c26120bdfd9b1a895bd..723f392940610c2744241d996512bc2a9e326954 100644
--- a/include/simulink_math_fcn.c
+++ b/include/simulink_math_fcn.c
@@ -1,80 +1,12 @@
 #include "simulink_math_fcn.h"
 #include <math.h>
 
-/* function exp_scalar_real (x: real) returns (y: real) prototype C lib m; */
-double exp_scalar_real (double x) {
-  return exp(x);
-}
-
-
-/* function log_scalar_real (x: real) returns (y: real) prototype C lib m; */
-double log_scalar_real (double x) {
-  return log(x);
-}
-/* function _10u_scalar_real (x: real) returns (y: real) prototype C lib m; */
-double _10u_scalar_real (double x) {
-  return pow(10.,x);
-}
-
-/* function log10_scalar_real (x: real) returns (y: real) prototype C lib m; */
-double log10_scalar_real (double x) {
-  return log10(x);
-}
-
-/* function magnitude_2_scalar_real (x: real) returns (y: real) prototype C lib m; */
-double magnitude_2_scalar_real (double x) {
-  return pow(fabs(x), 2.);
-}
 
-/* function square_scalar_real (x: real) returns (y: real) prototype C lib m; */
-double square_scalar_real (double x) {
-  return pow(x, 2.);
-}
-
-/* function pow_scalar_real (x,y: real) returns (z: real) prototype C lib m; */
-double pow_scalar_real (double x, double y) {
-  return pow(x, y);
-}
-
-/* function conj_scalar_real (x: real) returns (y: real) prototype C lib m; */
-double conj_scalar_real (double x) {
-  return x; // identity for real
-}
-
-/* function reciprocal_scalar_real (x: real) returns (y: real) prototype C lib m; */
-double reciprocal_scalar_real (double x) {
-  return 1./x; 
-}
-
-/* function hypot_scalar_real (x,y: real) returns (z: real) prototype C lib m; */
-double hypot_scalar_real (double x, double y) {
-  return sqrt(x*x + y*y); 
-}
-
-
-
-/*
-  mod function produces a result that is either zero or has the same sign as the divisor.
-  rem function produces a result that is either zero or has the same sign as the dividend.
-  mod(a,0) returns a
-  rem(a,0) returns NaN.
-
-function rem_scalar_real_int_int_int (x,y: int) returns (z: int) prototype C lib m;
-function rem_scalar_real_double_double_double (x,y: double) returns (z: double) prototype C lib m;
-function rem_scalar_real_double_int_double (x: double; y: int) returns (z: double) prototype C lib m;
-function rem_scalar_real_int_double_double (x: int; y: double) returns (z: double) prototype C lib m;
-
-function mod_scalar_real_int_int_int (x,y: int) returns (z: int) prototype C lib m;
-function mod_scalar_real_double_double_double (x,y: double) returns (z: double) prototype C lib m;
-function mod_scalar_real_double_int_double (x: double; y: int) returns (z: double) prototype C lib m;
-function mod_scalar_real_int_double_double (x: int; y: double) returns (z: double) prototype C lib m;
-*/
-
-int rem_scalar_real_int_int_int (int x, int y) {
+int rem_int (int x, int y) {
   return x%y;
 }
 
-int mod_scalar_real_int_int_int (int x, int y) {
+int mod_int (int x, int y) {
   int tmp;
   if (y == 0) { return x; };
   tmp = x%y;
@@ -86,11 +18,11 @@ int mod_scalar_real_int_int_int (int x, int y) {
   }
 }
 
-double rem_scalar_real_double_double_double (double x, double y) {
+double rem_real (double x, double y) {
   return fmod(x, y);
 }
 
-double mod_scalar_real_double_double_double (double x, double y) {
+double mod_real (double x, double y) {
   double tmp = 0.;
   if (y == 0.) { return x; };
   tmp = fmod(x, y);
@@ -101,24 +33,3 @@ double mod_scalar_real_double_double_double (double x, double y) {
     return tmp;
   }
 }
-
-double rem_scalar_real_double_int_double (double x, int y) {
-  return rem_scalar_real_double_double_double (x, (double)y);
-}
-
-double rem_scalar_real_int_double_double (int x, double y) {
-  return rem_scalar_real_double_double_double ((double)x, y);
-}
-
-
-double mod_scalar_real_double_int_double (double x, int y) {
-  return (mod_scalar_real_double_double_double (x, (double)y));
-}
-
-double mod_scalar_real_int_double_double (int x, double y) {
-  return (mod_scalar_real_double_double_double ((double)x, y));
-}
-
-/* function transpose_scalar_real (x: real) returns (y: real) prototype C lib m; */
-
-/* function hermitian_scalar_real (x: real) returns (y: real) prototype C lib m; */
diff --git a/include/simulink_math_fcn.lusi b/include/simulink_math_fcn.lusi
index 1f926509a1a4e38fab00bba887f19a1105f0cc36..c424807877f3f6d247321f14e46b6b60f4de6a3f 100644
--- a/include/simulink_math_fcn.lusi
+++ b/include/simulink_math_fcn.lusi
@@ -1,63 +1,4 @@
-(*
-Mathematical functions in Simulink Math Function blocks
-
-All these functions can be applied to scalar value. All but transpose and
-hermitian can be also applied as element-wise operations on vector, matrices
-inputs. transpose and hermitian are applied on vector and matrices as regular
-(non element-wise) operations.
-
-The Lustre library provides only scalar functions for all cases, and, in the future,
-the matrix versions of them.
-
-exp: 
-log
-10^u
-log10
-magnitude^2
-square
-pow
-conj
-reciprocal
-hypot
-rem
-mod
-transpose
-hermitian
-
-For the moment, we focus only on theoretical types: real, complex.
-A future version can be specialized for concrete datatypes (single, double,
-(u)intXX).
-
-*)
-
--- open <math>
-function fmod (x,y: real) returns (z: real) prototype C lib m;
-
-function exp_scalar_real (x: real) returns (y: real) prototype C lib m;
-function log_scalar_real (x: real) returns (y: real) prototype C lib m;
-function _10u_scalar_real (x: real) returns (y: real) prototype C lib m;
-function log10_scalar_real (x: real) returns (y: real) prototype C lib m;
-
--- complex modulus: |x|^2
-function magnitude_2_scalar_real (x: real) returns (y: real) prototype C lib m;
-function square_scalar_real (x: real) returns (y: real) prototype C lib m;
-function pow_scalar_real (x,y: real) returns (z: real) prototype C lib m;
-function conj_scalar_real (x: real) returns (y: real) prototype C lib m;
-function reciprocal_scalar_real (x: real) returns (y: real) prototype C lib m;
-function hypot_scalar_real (x,y: real) returns (z: real) prototype C lib m;
-
-function rem_scalar_real_int_int_int (x,y: int) returns (z: int) prototype C lib m;
-function rem_scalar_real_double_double_double (x,y: real) returns (z: real) prototype C lib m;
-function rem_scalar_real_double_int_double (x: real; y: int) returns (z: real) prototype C lib m;
-function rem_scalar_real_int_double_double (x: int; y: real) returns (z: real) prototype C lib m;
-
-function mod_scalar_real_int_int_int (x,y: int) returns (z: int) prototype C lib m;
-function mod_scalar_real_double_double_double (x,y: real) returns (z: real) prototype C lib m;
-function mod_scalar_real_double_int_double (x: real; y: int) returns (z: real) prototype C lib m;
-function mod_scalar_real_int_double_double (x: int; y: real) returns (z: real) prototype C lib m;
-
-(*
--- function transpose_scalar_real (x: real) returns (y: real) prototype C lib m;
--- function hermitian_scalar_real (x: real) returns (y: real) prototype C lib m;
--- function exp_matrix_real (const i,j: int; x: real^i^j) returns (y: real^i^j) prototype C lib m;
-*)
+function rem_int (x,y: int) returns (z: int) prototype C lib m;
+function rem_real (x,y: real) returns (z: real) prototype C lib m;
+function mod_int (x,y: int) returns (z: int) prototype C lib m;
+function mod_real (x,y: real) returns (z: real) prototype C lib m;