More changes

The hand over seems to work fine ...