changed documentation and names