enhanced the API, tests missing