*
* moved function to the right place
* wip