mistakes pointed by Rahel - stil need a better (less one case specific) solution. To be worked on next.