updated functionality
removed, because implemented