@sebv can you be a bit more descriptive? or move the code after we merge it?