merged with Dieterbe/experimental, finally