/rest vergessen...nochmals refactor