changed naming convention of functions (again !)