basic change to get Otto´s part to work
Merge commit '719a8ca5c7a2435f159f1fec0f1a24e8c2a14b1f'