fixed function names, no always from wave not from state or sth :)