work-in-progress, depends on experimental RL2-branch