Hm i must think about it - it should be more generalized...