going back to the old version, something is not right here.

The whole functionality should be refactored at some point!

references #20