@adrienthebo PR updated with comments.