modify again the api calls
Merge branch 'edbert'