hm ... more code that can be prettified