Ping @fabianp again about this :)