#6. Don't work - yet.

It just an adaptation of the old code. No big changes fancy there.