I have changed this, althought it goes against what I learned about functional programming ;-)